diff options
| author | Igor Sobrado <sobrado@cvs.openbsd.org> | 2017-03-26 00:22:50 +0000 |
|---|---|---|
| committer | Igor Sobrado <sobrado@cvs.openbsd.org> | 2017-03-26 00:22:50 +0000 |
| commit | 64b2b1b595c2c37cc88f99015605fb6032abe7d6 (patch) | |
| tree | 0aa627bb50179b12cba6430142cf30414ab00324 /sbin | |
| parent | 3629d27b0ba435a0d262cc0e8227b5dddc8b60a7 (diff) | |
cleanup fdisk(8) partition names used by FAT file systems so they are more
consistent and easier to identify, as outlined here:
- FAT12: FAT12 (01h)
- FAT16: FAT16S (04h), FAT16B (06h), FAT16L (0Eh)
- FAT32: FAT32 (0Bh), FAT32L (0Ch)
nothing in our tree is looking to the strings being replaced for anything
but printing them out, only to the numerical ids taken from disklabel.h
ok krw@, jmc@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/fdisk/fdisk.8 | 22 | ||||
| -rw-r--r-- | sbin/fdisk/part.c | 14 |
2 files changed, 18 insertions, 18 deletions
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index 959346ddb60..844a34a3490 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fdisk.8,v 1.93 2016/09/03 14:25:05 jmc Exp $ +.\" $OpenBSD: fdisk.8,v 1.94 2017/03/26 00:22:49 sobrado Exp $ .\" .\" .\" Copyright (c) 1997 Tobias Weingartner @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: September 3 2016 $ +.Dd $Mdocdate: March 26 2017 $ .Dt FDISK 8 .Os .Sh NAME @@ -192,20 +192,20 @@ of the MBR are displayed. For example: .Bd -literal -offset 1n # fdisk sd0 -Disk: sd0 geometry: 121601/255/63 [1953525168 Sectors] -Offset: 0 Signature: 0xAA55 - Starting Ending LBA Info: - #: id C H S - C H S [ start: size ] +Disk: sd0 geometry: 121601/255/63 [1953525168 Sectors] +Offset: 0 Signature: 0xAA55 + Starting Ending LBA Info: + #: id C H S - C H S [ start: size ] ------------------------------------------------------------------------ - 0: 0B 0 1 1 - 26108 0 63 [ 63: 419425020 ] Win95 FAT-32 - 1: 00 0 0 0 - 0 0 0 [ 0: 0 ] unused - 2: 00 0 0 0 - 0 0 0 [ 0: 0 ] unused -*3: A6 26108 1 1 - 121600 254 63 [ 419425083: 1534094982 ] OpenBSD + 0: 0B 0 1 1 - 26108 0 63 [ 63: 419425020 ] FAT32 + 1: 00 0 0 0 - 0 0 0 [ 0: 0 ] unused + 2: 00 0 0 0 - 0 0 0 [ 0: 0 ] unused +*3: A6 26108 1 1 - 121600 254 63 [ 419425083: 1534094982 ] OpenBSD .Ed .Pp This 1953525168 sector (931GB) disk drive is divided into two MBR partitions that span the whole disk. -The first MBR partition is a 200GB FAT-32 partition; +The first MBR partition is a 200GB FAT32 partition; the second is a 731GB .Ox MBR partition using the remainder of the disk. diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c index b5f6d2e2292..542c169d4e6 100644 --- a/sbin/fdisk/part.c +++ b/sbin/fdisk/part.c @@ -1,4 +1,4 @@ -/* $OpenBSD: part.c,v 1.76 2016/12/27 15:01:03 krw Exp $ */ +/* $OpenBSD: part.c,v 1.77 2017/03/26 00:22:49 sobrado Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -37,19 +37,19 @@ static const struct part_type { char guid[37]; } part_types[] = { { 0x00, "unused ", "00000000-0000-0000-0000-000000000000" }, - { 0x01, "DOS FAT-12 ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, + { 0x01, "FAT12 ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, { 0x02, "XENIX / "}, /* XENIX / filesystem */ { 0x03, "XENIX /usr "}, /* XENIX /usr filesystem */ - { 0x04, "DOS FAT-16 ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, + { 0x04, "FAT16S ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, { 0x05, "Extended DOS"}, /* Extended DOS */ - { 0x06, "DOS > 32MB ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, + { 0x06, "FAT16B ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, { 0x07, "NTFS ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, { 0x08, "AIX fs "}, /* AIX filesystem */ { 0x09, "AIX/Coherent"}, /* AIX boot partition or Coherent */ { 0x0A, "OS/2 Bootmgr"}, /* OS/2 Boot Manager or OPUS */ - { 0x0B, "Win95 FAT-32", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, - { 0x0C, "Win95 FAT32L", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, - { 0x0E, "DOS FAT-16 ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, + { 0x0B, "FAT32 ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, + { 0x0C, "FAT32L ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, + { 0x0E, "FAT16L ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, { 0x0F, "Extended LBA"}, /* Extended DOS LBA-mapped */ { 0x10, "OPUS "}, /* OPUS */ { 0x11, "OS/2 hidden ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" }, |