Add some more partition types.

PR:		i386/14793
MFC after:	3 days

1 files changed, 56 insertions, 26 deletions

diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index eca068d..0af514c 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -138,56 +138,85 @@ struct part_type
 	,{0x01, "Primary DOS with 12 bit FAT"}
 	,{0x02, "XENIX / filesystem"}
 	,{0x03, "XENIX /usr filesystem"}
-	,{0x04, "Primary DOS with 16 bit FAT (<= 32MB)"}
+	,{0x04, "Primary DOS with 16 bit FAT (< 32MB)"}
 	,{0x05, "Extended DOS"}
-	,{0x06, "Primary 'big' DOS (> 32MB)"}
+	,{0x06, "Primary 'big' DOS (>= 32MB)"}
 	,{0x07, "OS/2 HPFS, NTFS, QNX-2 (16 bit) or Advanced UNIX"}
-	,{0x08, "AIX filesystem"}
+	,{0x08, "AIX filesystem or SplitDrive"}
 	,{0x09, "AIX boot partition or Coherent"}
-	,{0x0A, "OS/2 Boot Manager or OPUS"}
+	,{0x0A, "OS/2 Boot Manager, OPUS or Coherent swap"}
 	,{0x0B, "DOS or Windows 95 with 32 bit FAT"}
-	,{0x0C, "DOS or Windows 95 with 32 bit FAT, LBA"}
-	,{0x0E, "Primary 'big' DOS (> 32MB, LBA)"}
-	,{0x0F, "Extended DOS, LBA"}
+	,{0x0C, "DOS or Windows 95 with 32 bit FAT (LBA)"}
+	,{0x0E, "Primary 'big' DOS (>= 32MB, LBA)"}
+	,{0x0F, "Extended DOS (LBA)"}
 	,{0x10, "OPUS"}
+	,{0x11, "OS/2 BM: hidden DOS with 12-bit FAT"}
+	,{0x12, "Compaq diagnostics"}
+	,{0x14, "OS/2 BM: hidden DOS with 16-bit FAT (< 32MB)"}
+	,{0x16, "OS/2 BM: hidden DOS with 16-bit FAT (>= 32MB)"}
+	,{0x17, "OS/2 BM: hidden IFS (e.g. HPFS)"}
+	,{0x18, "AST Windows swapfile"}
+	,{0x24, "NEC DOS"}
+	,{0x3C, "PartitionMagic recovery"}
 	,{0x39, "plan9"}
 	,{0x40, "VENIX 286"}
+	,{0x41, "Linux/MINIX (sharing disk with DRDOS)"}
+	,{0x42, "SFS or Linux swap (sharing disk with DRDOS)"}
+	,{0x43, "Linux native (sharing disk with DRDOS)"}
 	,{0x4D, "QNX 4.2 Primary"}
 	,{0x4E, "QNX 4.2 Secondary"}
 	,{0x4F, "QNX 4.2 Tertiary"}
-	,{0x50, "DM"}
-	,{0x51, "DM"}
+	,{0x50, "DM (disk manager)"}
+	,{0x51, "DM6 Aux1 (or Novell)"}
 	,{0x52, "CP/M or Microport SysV/AT"}
-	,{0x56, "GB"}
-	,{0x61, "Speed"}
-	,{0x63, "ISC UNIX, other System V/386, GNU HURD or Mach"}
-	,{0x64, "Novell Netware 2.xx"}
-	,{0x65, "Novell Netware 3.xx"}
+	,{0x53, "DM6 Aux3"}
+	,{0x54, "DM6"}
+	,{0x55, "EZ-Drive (disk manager)"}
+	,{0x56, "Golden Bow (disk manager)"}
+	,{0x5c, "Priam Edisk (disk manager)"} /* according to S. Widlake */
+	,{0x61, "SpeedStor"}
+	,{0x63, "System V/386 (such as ISC UNIX), GNU HURD or Mach"}
+	,{0x64, "Novell Netware/286 2.xx"}
+	,{0x65, "Novell Netware/386 3.xx"}
+	,{0x70, "DiskSecure Multi-Boot"}
 	,{0x75, "PCIX"}
-	,{0x80, "Minix 1.1 ... 1.4a"}
-	,{0x81, "Minix 1.4b ... 1.5.10"}
+	,{0x77, "QNX4.x"}
+	,{0x78, "QNX4.x 2nd part"}
+	,{0x79, "QNX4.x 3rd part"}
+	,{0x80, "Minix until 1.4a"}
+	,{0x81, "Minix since 1.4b, early Linux partition or Mitac (disk manager)"}
 	,{0x82, "Linux swap or Solaris x86"}
-	,{0x83, "Linux filesystem"}
+	,{0x83, "Linux native"}
+	,{0x84, "OS/2 hidden C: drive"}
+	,{0x85, "Linux extended"}
+	,{0x86, "NTFS volume set??"}
+	,{0x87, "NTFS volume set??"}
 	,{0x93, "Amoeba filesystem"}
 	,{0x94, "Amoeba bad block table"}
 	,{0x9F, "BSD/OS"}
 	,{0xA0, "Suspend to Disk"}
 	,{0xA5, "FreeBSD/NetBSD/386BSD"}
 	,{0xA6, "OpenBSD"}
-	,{0xA7, "NEXTSTEP"}
+	,{0xA7, "NeXTSTEP"}
 	,{0xA9, "NetBSD"}
 	,{0xB7, "BSDI BSD/386 filesystem"}
 	,{0xB8, "BSDI BSD/386 swap"}
-	,{0xDB, "Concurrent CPM or C.DOS or CTOS"}
-	,{0xE1, "Speed"}
-	,{0xE3, "Speed"}
-	,{0xE4, "Speed"}
+	,{0xC1, "DRDOS/sec with 12-bit FAT"}
+	,{0xC4, "DRDOS/sec with 16-bit FAT (< 32MB)"}
+	,{0xC6, "DRDOS/sec with 16-bit FAT (>= 32MB)"}
+	,{0xC7, "Syrinx"}
+	,{0xDB, "CP/M, Concurrent CP/M, Concurrent DOS or CTOS"}
+	,{0xE1, "DOS access or SpeedStor with 12-bit FAT extended partition"}
+	,{0xE3, "DOS R/O or SpeedStor"}
+	,{0xE4, "SpeedStor with 16-bit FAT extended partition < 1024 cyl."}
+	,{0xEB, "BeOS filesystem"}
 	,{0xEE, "EFI GPT"}
 	,{0xEF, "EFI System Partition"}
-	,{0xF1, "Speed"}
+	,{0xF1, "SpeedStor"}
 	,{0xF2, "DOS 3.3+ Secondary"}
-	,{0xF4, "Speed"}
-	,{0xFF, "BBT (Bad Blocks Table)"}
+	,{0xF4, "SpeedStor large partition"}
+	,{0xFE, "SpeedStor >1024 cyl. or LANstep"}
+	,{0xFF, "Xenix bad blocks table"}
 };
 
 static void print_s0(int which);
@@ -459,7 +488,8 @@ print_part(int i)
 	part_mb = partp->dp_size;
 	part_mb *= secsize;
 	part_mb /= (1024 * 1024);
-	printf("sysid %d,(%s)\n", partp->dp_typ, get_type(partp->dp_typ));
+	printf("sysid %d (%#04x),(%s)\n", partp->dp_typ, partp->dp_typ,
+	    get_type(partp->dp_typ));
 	printf("    start %lu, size %lu (%qd Meg), flag %x%s\n",
 		(u_long)partp->dp_start,
 		(u_long)partp->dp_size,