summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2007-12-08 06:44:27 +0000
committermarcel <marcel@FreeBSD.org>2007-12-08 06:44:27 +0000
commit80494145a25739c528a0c8113f8833d32a61ff8d (patch)
tree506c599ec93830db01cda2fefbfb3c825738a0c7 /sys
parent4570db7ea28fc5ce957287d6edf34d234b101d40 (diff)
downloadFreeBSD-src-80494145a25739c528a0c8113f8833d32a61ff8d.zip
FreeBSD-src-80494145a25739c528a0c8113f8833d32a61ff8d.tar.gz
Sync with NetBSD rev 1.101.
This also fixes fstypenames being short an entry.
Diffstat (limited to 'sys')
-rw-r--r--sys/sys/disklabel.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 74fd9af..08f0ae6 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -224,7 +224,13 @@ static const char *dktypenames[] = {
#define FS_BOOT 13 /* partition contains bootstrap */
#define FS_VINUM 14 /* Vinum drive */
#define FS_RAID 15 /* RAIDFrame drive */
+#define FS_FILECORE 16 /* Acorn Filecore Filing System */
+#define FS_EXT2FS 17 /* ext2fs */
+#define FS_NTFS 18 /* Windows/NT file system */
+#define FS_CCD 20 /* concatenated disk component */
#define FS_JFS2 21 /* IBM JFS2 */
+#define FS_UDF 24 /* UDF */
+#define FS_EFS 26 /* SGI's Extent File system */
#ifdef FSTYPENAMES
static const char *fstypenames[] = {
@@ -244,11 +250,17 @@ static const char *fstypenames[] = {
"boot",
"vinum",
"raid",
+ "Filecore",
+ "EXT2FS",
+ "NTFS",
"?",
+ "ccd",
+ "jfs",
"?",
"?",
- "?",
- "jfs",
+ "UDF",
+ "?"
+ "EFS",
NULL
};
#define FSMAXTYPES (sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
OpenPOWER on IntegriCloud