From b8c19fd719945f5b9ff51320f8dbe46dd23510c1 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Wed, 2 Sep 2015 14:08:43 +0000 Subject: [PATCH] It's 2015, and some people are still trying to use fdisk and then go asking what debug flags to set for GEOM to make it work. Advice them to use gpart(8) instead. Something similar should probably done with disklabel, but I need to rewrite the disklabel examples first. Reviewed by: wblock@ MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D3315 --- sbin/bsdlabel/bsdlabel.8 | 6 ++++-- sbin/dumpfs/dumpfs.8 | 2 +- sbin/fdisk/fdisk.8 | 7 +++++++ sbin/ffsinfo/ffsinfo.8 | 2 +- sbin/mdconfig/mdconfig.8 | 3 +-- sbin/newfs/newfs.8 | 2 +- sbin/newfs_msdos/newfs_msdos.8 | 4 +--- sbin/newfs_nandfs/newfs_nandfs.8 | 4 +--- sbin/reboot/boot_i386.8 | 2 +- share/man/man4/da.4 | 3 +-- share/man/man4/md.4 | 3 +-- share/man/man4/vpo.4 | 2 +- share/man/man7/tuning.7 | 2 +- share/man/man8/picobsd.8 | 2 +- usr.sbin/boot0cfg/boot0cfg.8 | 5 ++--- 15 files changed, 25 insertions(+), 24 deletions(-) diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8 index 54e2af2e534..7a4852e7a2f 100644 --- a/sbin/bsdlabel/bsdlabel.8 +++ b/sbin/bsdlabel/bsdlabel.8 @@ -445,7 +445,10 @@ to properly recognize the disk: .Bd -literal -offset indent dd if=/dev/zero of=/dev/da0 bs=512 count=32 -fdisk -BI da0 +gpart create -s MBR da0 +gpart add -t freebsd da0 +gpart set -a active -i 1 da0 +gpart bootcode -b /boot/mbr da0 dd if=/dev/zero of=/dev/da0s1 bs=512 count=32 bsdlabel -w -B da0s1 bsdlabel -e da0s1 @@ -495,6 +498,5 @@ are not generally compatible. .Xr md 4 , .Xr disktab 5 , .Xr boot0cfg 8 , -.Xr fdisk 8 , .Xr gpart 8 , .Xr newfs 8 diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8 index feb8758b5a1..bb8e93c3090 100644 --- a/sbin/dumpfs/dumpfs.8 +++ b/sbin/dumpfs/dumpfs.8 @@ -100,8 +100,8 @@ flag is needed if the filesystem uses .Sh SEE ALSO .Xr disktab 5 , .Xr fs 5 , -.Xr disklabel 8 , .Xr fsck 8 , +.Xr gpart 8 , .Xr newfs 8 , .Xr tunefs 8 .Sh HISTORY diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index fcab1339782..6894ab9f52e 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -39,6 +39,13 @@ The utility can be used to divide space on the disk into slices and set one active. .Sh DESCRIPTION +.Bf -symbolic +This command is obsolete. +Users are advised to use +.Xr gpart 8 +instead. +.Ef +.Pp The .Fx utility, diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8 index d3c8e9f4ff0..4bf5cdd1cb1 100644 --- a/sbin/ffsinfo/ffsinfo.8 +++ b/sbin/ffsinfo/ffsinfo.8 @@ -121,9 +121,9 @@ to .Pa /var/tmp/ffsinfo with all available information. .Sh SEE ALSO -.Xr disklabel 8 , .Xr dumpfs 8 , .Xr fsck 8 , +.Xr gpart 8 , .Xr growfs 8 , .Xr gvinum 8 , .Xr newfs 8 , diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8 index 26453272153..6818d7bb951 100644 --- a/sbin/mdconfig/mdconfig.8 +++ b/sbin/mdconfig/mdconfig.8 @@ -300,8 +300,7 @@ mount /dev/md1.nop /mnt .Sh SEE ALSO .Xr md 4 , .Xr ffs 7 , -.Xr bsdlabel 8 , -.Xr fdisk 8 , +.Xr gpart 8 , .Xr mdmfs 8 , .Xr malloc 9 .Sh HISTORY diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8 index a4067e94086..f261bb01a63 100644 --- a/sbin/newfs/newfs.8 +++ b/sbin/newfs/newfs.8 @@ -303,11 +303,11 @@ on file systems that contain many small files. .Xr geom 4 , .Xr disktab 5 , .Xr fs 5 , -.Xr bsdlabel 8 , .Xr camcontrol 8 , .Xr dump 8 , .Xr dumpfs 8 , .Xr fsck 8 , +.Xr gpart 8 , .Xr gjournal 8 , .Xr growfs 8 , .Xr gvinum 8 , diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8 index 0f1abb4e5cd..967e1513556 100644 --- a/sbin/newfs_msdos/newfs_msdos.8 +++ b/sbin/newfs_msdos/newfs_msdos.8 @@ -228,9 +228,7 @@ Create a 30MB image file, with the FAT partition starting newfs_msdos -C 30M -@63s ./somefile .Ed .Sh SEE ALSO -.Xr disktab 5 , -.Xr disklabel 8 , -.Xr fdisk 8 , +.Xr gpart 8 , .Xr newfs 8 .Sh HISTORY The diff --git a/sbin/newfs_nandfs/newfs_nandfs.8 b/sbin/newfs_nandfs/newfs_nandfs.8 index 7a630bbbf89..fe321639410 100644 --- a/sbin/newfs_nandfs/newfs_nandfs.8 +++ b/sbin/newfs_nandfs/newfs_nandfs.8 @@ -63,9 +63,7 @@ Create a file system, using default parameters, on newfs_nandfs /dev/ada0s1 .Ed .Sh SEE ALSO -.Xr disktab 5 , -.Xr disklabel 8 , -.Xr fdisk 8 , +.Xr gpart 8 , .Xr newfs 8 .Sh HISTORY The diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8 index 690dfcd436e..71fa8e01f13 100644 --- a/sbin/reboot/boot_i386.8 +++ b/sbin/reboot/boot_i386.8 @@ -352,9 +352,9 @@ requirement has not been adhered to. .Xr make.conf 5 , .Xr ttys 5 , .Xr boot0cfg 8 , -.Xr bsdlabel 8 , .Xr btxld 8 , .Xr config 8 , +.Xr gpart 8 , .Xr gptboot 8 , .Xr halt 8 , .Xr loader 8 , diff --git a/share/man/man4/da.4 b/share/man/man4/da.4 index 7d6f83b48f1..b5aaa298a76 100644 --- a/share/man/man4/da.4 +++ b/share/man/man4/da.4 @@ -205,8 +205,7 @@ None. .Xr ada 4 , .Xr cam 4 , .Xr geom 4 , -.Xr bsdlabel 8 , -.Xr fdisk 8 +.Xr gpart 8 .Sh HISTORY The .Nm diff --git a/share/man/man4/md.4 b/share/man/man4/md.4 index af91e58eaa2..477465fe9d3 100644 --- a/share/man/man4/md.4 +++ b/share/man/man4/md.4 @@ -81,8 +81,7 @@ disk found in the man page. Other tools will also create these images, such as NanoBSD. .Sh SEE ALSO -.Xr disklabel 8 , -.Xr fdisk 8 , +.Xr gpart 8 , .Xr loader 8 , .Xr mdconfig 8 , .Xr mdmfs 8 , diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4 index 722a18ff53a..925dadf26ae 100644 --- a/share/man/man4/vpo.4 +++ b/share/man/man4/vpo.4 @@ -64,7 +64,7 @@ When mounting a DOS file system or formatting a .Fx file system, check the slice of the disk with the -.Xr fdisk 8 +.Xr gpart 8 utility. .Pp In order to unixify a ZIP disk, put the following in /etc/disktab: diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7 index 12b03c2b248..4af2ef213b4 100644 --- a/share/man/man7/tuning.7 +++ b/share/man/man7/tuning.7 @@ -753,10 +753,10 @@ over services you export from your box (web services, email). .Xr ports 7 , .Xr boot 8 , .Xr bsdinstall 8 , -.Xr bsdlabel 8 , .Xr ccdconfig 8 , .Xr config 8 , .Xr fsck 8 , +.Xr gpart 8 , .Xr gjournal 8 , .Xr gstripe 8 , .Xr gvinum 8 , diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8 index 4d4daa1020b..3113a0c0fb7 100644 --- a/share/man/man8/picobsd.8 +++ b/share/man/man8/picobsd.8 @@ -425,7 +425,7 @@ third form, replacing .Ar NN with the actual start of the partition (which you can determine using -.Xr fdisk 8 ) . +.Xr gpart 8 ) . Note that after saving the image to the slice, it will not yet be recognised. You have to use the diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8 index 9e413c0a611..bf0d35d489a 100644 --- a/usr.sbin/boot0cfg/boot0cfg.8 +++ b/usr.sbin/boot0cfg/boot0cfg.8 @@ -180,14 +180,13 @@ To enable just slices 1 and 3 in the menu: .Dl "boot0cfg -m 0x5 ada0" .Pp To go back to non-interactive booting, use -.Xr fdisk 8 +.Xr gpart 8 to install the default MBR: .Pp -.Dl "fdisk -B ada0" +.Dl "gpart bootcode -b /boot/mbr ada0" .Sh SEE ALSO .Xr geom 4 , .Xr boot 8 , -.Xr fdisk 8 , .Xr gpart 8 .Sh AUTHORS .An Robert Nordier Aq Mt rnordier@FreeBSD.org