aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2020-02-15 13:25:04 +0000
committerRon Yorston <rmy@pobox.com>2020-02-15 13:25:04 +0000
commit0abe89bc214c9d1f16f32c4339792066b875b7c6 (patch)
tree3748f654565bd08513093ebfbb68487f612b5e3f /util-linux
parent6885083a7e4f94938ca0a98e2c6c69a84eb08a1f (diff)
parenta6e48dead331c3c19e070992d2d571e74a1d9a8d (diff)
downloadbusybox-w32-0abe89bc214c9d1f16f32c4339792066b875b7c6.tar.gz
busybox-w32-0abe89bc214c9d1f16f32c4339792066b875b7c6.tar.bz2
busybox-w32-0abe89bc214c9d1f16f32c4339792066b875b7c6.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/fdisk.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index e58cb0fd1..f568fe92c 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -344,6 +344,7 @@ static const char *const i386_sys_types[] = {
344 "\xa8" "Darwin UFS", 344 "\xa8" "Darwin UFS",
345 "\xa9" "NetBSD", 345 "\xa9" "NetBSD",
346 "\xab" "Darwin boot", 346 "\xab" "Darwin boot",
347 "\xaf" "HFS / HFS+",
347 "\xb7" "BSDI fs", 348 "\xb7" "BSDI fs",
348 "\xb8" "BSDI swap", 349 "\xb8" "BSDI swap",
349 "\xbe" "Solaris boot", 350 "\xbe" "Solaris boot",
@@ -390,15 +391,12 @@ static const char *const i386_sys_types[] = {
390 "\xc6" "DRDOS/sec (FAT-16)", 391 "\xc6" "DRDOS/sec (FAT-16)",
391 "\xc7" "Syrinx", 392 "\xc7" "Syrinx",
392 "\xda" "Non-FS data", 393 "\xda" "Non-FS data",
393 "\xdb" "CP/M / CTOS / ...",/* CP/M or Concurrent CP/M or 394 "\xdb" "CP/M / CTOS / ...",/* CP/M or Concurrent CP/M or Concurrent DOS or CTOS */
394 Concurrent DOS or CTOS */
395 "\xde" "Dell Utility", /* Dell PowerEdge Server utilities */ 395 "\xde" "Dell Utility", /* Dell PowerEdge Server utilities */
396 "\xdf" "BootIt", /* BootIt EMBRM */ 396 "\xdf" "BootIt", /* BootIt EMBRM */
397 "\xe1" "DOS access", /* DOS access or SpeedStor 12-bit FAT 397 "\xe1" "DOS access", /* DOS access or SpeedStor 12-bit FAT extended partition */
398 extended partition */
399 "\xe3" "DOS R/O", /* DOS R/O or SpeedStor */ 398 "\xe3" "DOS R/O", /* DOS R/O or SpeedStor */
400 "\xe4" "SpeedStor", /* SpeedStor 16-bit FAT extended 399 "\xe4" "SpeedStor", /* SpeedStor 16-bit FAT extended partition <1024 cyl. */
401 partition < 1024 cyl. */
402 "\xf1" "SpeedStor", 400 "\xf1" "SpeedStor",
403 "\xf4" "SpeedStor", /* SpeedStor large partition */ 401 "\xf4" "SpeedStor", /* SpeedStor large partition */
404 "\xfe" "LANstep", /* SpeedStor >1024 cyl. or LANstep */ 402 "\xfe" "LANstep", /* SpeedStor >1024 cyl. or LANstep */