diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-01-13 08:02:41 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-01-13 08:02:41 +0000 |
| commit | 4734416a21312488a5099a297907783bee4ccc22 (patch) | |
| tree | e42b034f9685a0a07ad080076b757bfba654cf7d /util-linux | |
| parent | b8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (diff) | |
| parent | b3eec1651fb02d70716caa355f49320719f74c75 (diff) | |
| download | busybox-w32-4734416a21312488a5099a297907783bee4ccc22.tar.gz busybox-w32-4734416a21312488a5099a297907783bee4ccc22.tar.bz2 busybox-w32-4734416a21312488a5099a297907783bee4ccc22.zip | |
Merge busybox into merge
Fix merge conflicts in coreutils/ls.c and shell/ash.c.
Update config files to turn off SHA1_HWACCEL. It uses non-portable
assembler.
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fdisk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 9c393b8fc..20e7d56fa 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
| @@ -355,6 +355,7 @@ static const char *const i386_sys_types[] ALIGN_PTR = { | |||
| 355 | "\xef" "EFI (FAT-12/16/32)", /* Intel EFI System Partition */ | 355 | "\xef" "EFI (FAT-12/16/32)", /* Intel EFI System Partition */ |
| 356 | "\xf0" "Linux/PA-RISC boot", /* Linux/PA-RISC boot loader */ | 356 | "\xf0" "Linux/PA-RISC boot", /* Linux/PA-RISC boot loader */ |
| 357 | "\xf2" "DOS secondary", /* DOS 3.3+ secondary */ | 357 | "\xf2" "DOS secondary", /* DOS 3.3+ secondary */ |
| 358 | "\xf8" "EBBR protective", /* Arm EBBR firmware protective partition */ | ||
| 358 | "\xfd" "Linux raid autodetect", /* New (2.2.x) raid partition with | 359 | "\xfd" "Linux raid autodetect", /* New (2.2.x) raid partition with |
| 359 | autodetect using persistent | 360 | autodetect using persistent |
| 360 | superblock */ | 361 | superblock */ |