Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Sweep man pages replacing ad -> ada.

Approved by: re (blackend)
MFC after: 1 week
X-MFC note: stable/9 only

VMware environment is frequent nowadays. Add VMFS id.

MFC after: 2 weeks

Fix multi-line comment formatting.

Pointed by: jh
MFC after: 1 week

Improve error reporting when MBR can not be written.
Remove obsolete code which uses DIOCSMBR ioctl.
When writing MBR first check that GEOM_MBR is available, if it is not
available, then try write MBR directly to provider. If both are failed,
then recommend to use gpart(8).

MFC after: 2 week

Initialize "acc" value inside the loop to reset failed attempts.

PR: misc/162262
MFC after: 3 days

Add reference to gpart(8).

MFC after: 3 days

Add missing static keywords for global variables to tools in sbin/.

These tools declare global variables without using the static keyword,
even though their use is limited to a single C-file, or without placing
an extern declaration of them in the proper header file.

remove trailing whitespace...

MFC after: 1 week

error if /boot/mbr is empty... This can happen on a system like arm
that doesn't have a /boot/mbr, and you touch it to get past the previous
error message...

MFC after: 1 week

The decimal() function was changed in r217808 to take the
maximum value instead of number of bits. But for case when
limitation is not needed it erroneously skips conversion to
number and always returns zero. So, don't skip conversion
for case when limitation is not needed.

PR: bin/159765
Approved by: re (kib)

The MBR uses a 32-bit unsigned integer to store the size of a slice, but
fdisk(1) internally uses a signed int. Should a user attempt to specify
a slice containing more than 2^31 - 1 sectors, an error will be reported
on systems with sizeof(long) == 4 and the slice size will be silently
truncated on systems with sizeof(long) > 4.

Instead use an unsigned long to store the slice size in fdisk(1). This
allows the user to specify a slice size up to the maximum permitted by
the MBR on-disk format and does not have any problems with silent
truncation should the use specify an slice size larger than 2^32 on systems
with sizeof(long) > 4.

Submitted by: Mark Johnston (markjdb AT gmail DOT com)
MFC after: 2 weeks

Supply maximum value as an argument to the decimal() function
instead of supplying number of bits.

Submitted by: bde

o Cylinder numbers are 10 bits in the MBR;

o Sector numbers are only 6 bits in the MBR;

o bde'cize name of the local variable.

Submitted by: bde

Warn user when value entered is greated than the amount supported
by the MBR for the given parameter and set that parameter to the
maximum value instead of just truncating the most significant part
silently.

Could happen for example if the capacity of the device is more
than 2TB, so that the number of sectors is greater than 2Mib.

MFC after: 1 month

Add support for identifying a journaled root filesystem.
Fix support for identifying the given /dev/vinum/root example.

MFC after: 3 weeks

Handle geli-encrypted root disk devices.

MFC after: 2 weeks

- Back out the previous change in order to maintain compatibility.

- The maximum number of heads is 255, not 256.

Pointed out by: marcel

Bump the document date to reflect the 'p' command enhancements.

Suggested by: trhodes

Enhance the 'p' command so that it understands size qualifiers (K/M/G) and
so that it understands '*' as 'DTRT'.

PR: 68312
Submitted by: Rene de Vries - rene at tunix dot nl (mostly)
MFC after: 3 weeks

Reword some entries for NTFS and DOS.
Add entries for DELL and ASUS recovery partitions.

MFC after: 3 days

Another change from Christoph:
replace the table of partition with a simpler and faster array of strings.
The change in the array is done mechanically, using vi commands.
Most entries in the table are probably 15+ years old and largely outdated,
so the next step is to remove stale entries with more current values.

Submitted by: Christoph Mallon, with small changes from me
MFC after: 3 days

more changes from Christoph:
pass a pointer instead of an index to print_part()
so it does not depend on a static variable.

Submitted by: Christoph Mallon
MFC after: 3 days

remove unused argument to print_s0()

Submitted by: Christoph Mallon
MFC after: 3 days

Some small fixes submitted by Christoph Mallon, specifically:

+ Remove a dead field of a struct. It serves no purpose anymore.
+ Remove a \n at the end of the format string of err(); the err()
function already adds a \n ;
+ remove many unnecessary casts which obfuscate the code.

This file has a huge number of indentation bugs, but I'd rather fix
them when/if we happen to modify the relevant parts of the code.

Submitted by: Christoph Mallon
MFC after: 3 days

- Improve error message given on g_providername call failure.
- While there, make error messages consistent with the rest.

Approved by: kib (mentor)

Add missing library dependencies.

PR: bin/127573
Submitted by: Eygene Ryabinkin

- Make use of the new and g_device_path utility function in libgeom to avoid
duplication of code in fdisk and boot0cfg. Also make use of g_providername to
fix an issue with fdisk and boot0cfg not using the correct provider when
writing the MBR.

Reviewed by: phk
Approved by: pjd (mentor)

Add a -q[uiet] flag for scripts.

Add Apple HFS+ (0xAF) MBR partition type identificator.

Submitted by: rpaulo (SoC2007 student)

o Add -p flag: print a slice table in fdisk configuration file format.
Now it is possible to do something like fdisk -p ad0 | fdisk -f - ad1.

PR: bin/110182
Submitted by: Jukka A. Ukkonen
MFC after: 1 month

- Document -u, -i, and the difference between them better.
- Remove some historical notes about "future" decisions.

Document the following change in behavior:

: fdisk.c revision 1.74
: date: 2004/06/14 07:21:19; author: phk; state: Exp; lines: +3 -3
: Make fdisk initialize the first instead of the last slice by default.

- Fail with an understandable error message if we cannot detect the
sector size, instead of later failing with an error about /boot/mbr
not being a multiple of the sector size (since we end up with an
assumed sector size of MAX_SEC_SIZE * 2).
- We query the sector size via an IOCTL anyway, so if that succeeds
use that instead of probing for it via read(2) calls. This fixes
the problem with fdisk failing to operate on at least graid3 and
md(4) devices on kernels with src/sys/geom/geom_dev.c before
rev. 1.90, due to fdisk failing to detect the sector size.
- When detecting the root device allow "/" characters in it, which
happens with e.g. gmirror devices.

Reviewed by: cperciva
MFC after: 1 week

Call gctl_free() to free resource allocated with gctl_get_handle().

PR: bin/84664
Submitted by: Daan Vreeken <Danovitsch at Vitsch dot net>
MFC after: 3 days

Attempt gctl verb "write MBR" when updating.

This should solve the problem of modifying a busy MBR.

cosmetic changes.

Use NDOSPART macro instead of a magic number.

If we resort to opening a slice instead of the base device, do so with
the correct mode for our arguments.

Add 0xbf as new partition id for Solaris.

Submitted by: Lawrence.Lee@sun.com

Don't prepend "/dev" if an argument given is an absolute pathname.

Reviewed by: jhb

Mechanically kill hard sentence breaks.

Make fdisk initialize the first instead of the last slice by default.

style.Makefile(5):
Use WARNS?= instead of WARNS=.

Add the Solaris x86 boot partition type. This is used in Solaris 10
(and perhaps earlier).

Submitted by: Joerg Schilling <schilling@fokus.fraunhofer.de>

Warn about partitions that would overlap with the master boot record, and
if the user agrees, move them out one track.

MFC after: 7 days

s/disklabel/bsdlabel where needed.

Use __FBSDID() to quiet GCC 3.3 warnings.

Use symbolic constants from <sys/diskmbr.h> instead of local constants.

Always set the magic sequence when we write, rather than trusting the
previously read boot code to do so.

Use explicit encoding/decoding of little endian disk image.

Remove a comment which was OBE.

Change the test vector for "fdisk -I" to reflect that there is a magic
sequence in the result now.

Add test case for "fdisk" which reads the image back.

At least for the two test-cases this program now gives the same result
on sparc64 as on i386. The lack of an installed /boot/mbr on sparc64
raises an (un)interesting question.

Pull in the encoding/decoding functions for struct dos_partition.

Add a very simple regression test for "fdisk -I".

Use default geometry in case the device doesn't provide one:
512 for sectorsize.
63 for sectors.
255 for heads.
This will mostly show up on MD(4) devices.

Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/
Add FreeBSD Id tag where missing.

Make fdisk work on active GEOM devices.

Fix the regexp evilness so that fdisk can (again?) find the device
root is on from the root mount path.

Spotted by: imp

Don't attempt to find the geometry with disklabel based ioctl, it just
issues a useless warning now.

Split MBR and PC98 on-disk sliceformats out from disklabel.h, step 1:

Peter had repocopied sys/disklabel.h to sys/diskpc98.h and sys/diskmbr.h.

These two new copies are still intact copies of disklabel.h and
therefore protected by #ifndef _SYS_DISKLABEL_H_ so #including them
in programs which already include <sys.disklabel.h> is currently a
no-op.

This commit adds a number of such #includes.

Once I have verified that I have fixed all the places which need fixing,
I will commit the updated versions of the three #include files.

Sponsored by: DARPA & NAI Labs.

Straighten out get_params().

Sponsored by: DARPA & NAI Labs.

Try to pick up disk geometry with specific DIOC* ioctls, rather than
expecting a bogo-disklabel to contain them, if possible.

This makes fdisk work with GEOM.

s/filesystem/file system/g as discussed on -developers

Fixed some print format errors. Avoid some warnings about possible
(but not actual) alignment problems. Both of these bugs were detected
on ia64's and were fatal on ia64's due to premature setting of WARNS
to 4.

mdoc(7) police: tidy up the markup and some wording.

Add a hack so that fdisk(8) can initialize an ia64 disk. There is
no /boot/mbr to read the boot code from (ia64 does not *have* bootblocks!).
fdisk depended on magic in the /boot/mbr file to initialize some fields.

Add partition type for IBM's JFS.

Submitted by: Hiten Pandya <hiten@uk.FreeBSD.org>

Fix the fdisk(8) manual page.
s/partition/slice/ in fdisk.8
fix a bug in fdisk(8) where it did not honer -t when using -I

PR: 36563 and 35688
Submitted by: bde
Reviewed by: bde

Get this to WARNS=4 and closer to style(9) at a sacrifice in
linelength.

Add some more partition types.

PR: i386/14793
MFC after: 3 days

Oops, the arguments to a bcopy() were reversed, which broke zeroing
of unused partition entries and later detection of unused entries.

Use memcpy to be consistent with the rest of the code, and fix a
minor style nit.

Submitted by: bde

Default to WARNS=2.
Binary builds that cannot handle this must explicitly set WARNS=0.

Reviewed by: mike

Fixed spelling error in previous commit.

Add 0xEE (EFI GPT) and 0xEF (EFI System Partition)

mdoc(7) police: protect trailing full stops of abbreviations
with a trailing zero-width space: `e.g.\&'.

Fix a number of bugs and annoyances in fdisk, many of which were
pointed out by bde:
- Ask for user confirmation before adjusting to a head/cylinder
boundary (only when running interactively), and separate this
adjustment from the automatic calculation of c/h/s parameters.
- In sanitize_partition, don't change any values in the slice until
we know that the automatic adjustment will succeed.
- When auto-adjusting, ignore unused slices and give an appropriate
error for other zero-size slices depending on the cause.
- Change dos() to do all of the c/h/s calculations for a whole slice;
this fixes a bug where the ending c/h/s of an unused slice was set
incorrectly.
- When changing the active slice, detect the currently active slice
number instead of always defaulting to slice 4.
- Call fflush(stdout) before calling fgets().
- Test for fgets() returning NULL so we don't loop on EOF.

Reviewed by: bde

fdisk(8): document the default for -b, add xref to boot0cfg(8).
boot0cfg(8): add FILES section.

Reviewed by: rnordier

Remove whitespace at EOL.

After some (long-standing ;-) critics from Bruce, throw away the old
device search code i introduce nearly six years ago in rev 1.8. Bruce
suggested to rather use the device name of the root filesystem instead
which is certainly the most sensible default. Since there are many
possible cases for a root filesystem name (device with and without
slices, consider /dev/vinum/root even though it currently could not
work as such), there's some heuristic using a RE in order to find out
the canonical device name from the mounted name. This probably won't
quite fit for a NFS root (can't test that right now), but then,
there's hard to find a good default for those machines anyway. ;-)

This unbreaks the functionality of rev 1.2 i once broke in 1.8. :)

mdoc(7) police: removed HISTORY info from the .Os call.

Make open_disk() fail nicely upon encountering an ENOENT so to not
prematurely terminate the search for a usable disk. ENOENT is quite
normal in particulare now with the advent of devfs.

While being here, also remove /dev/wd0 and /dev/od0 from the list of
disks to search since we don't have them anymore.

MFC after: 1 week

wd0 -> ad0

PR: 26343
Submitted by: Sergey A. Osokin <osa@FreeBSD.org.ru>

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

Set the default manual section for sbin/ to 8.

Eliminate mdocNG warnings caused by misplaced or extraneous macro calls.

mdoc(7) police: split punctuation characters + misc fixes.

Prepare for mdoc(7)NG.

mdoc(7) police: added missing .Os call.

I didn't maintain the "chs" ordering. Rather the bug was in print_part().

Requested by: bde.

mdoc(7) police: use the new features of the Nm macro.

Make the order of values prompted for with the "-i" option match print_part()

Use Fx macro wherever possible.

Avoid use of direct troff requests in mdoc(7) manual pages.

- When adjusting the end of a partition to lie on a cylinder boundary, don't
adjust the size, but the actual end.
- Break out some of the sanity checks on partitions into a sanitize_partition
function.
- When adjusting partitions, always adjust the start "up", and the end "down"
so that we stay within the boundaries of the original request.
- Various small nits found by bde.

Reported by: bde, imp, rgrimes

0xA0 = Suspend to disk.

Fix a really stupid bug where I assumed sizeof(int) == 2. This resulted in
MBR's with a 4th slice failing the signature check and fdisk saying that
they are invalid.

Submitted by: bde

- Don't try to free mboot.bootinst before it has been allocated. If, for
some reason, mboot.bootinst is not initialized to NULL at the beginning
of the program, then the last commit to this would try to free whatever
bogus address is in it.
- Restore the behavior of free()'ing the mboot.bootinst buffer after we
abuse it to determine the sector size of the disk (as clearly noted in
the comments). Properly fix the double free() bug by setting the pointer
to NULL after we free it.

Fix memory leak/double free found by phkmalloc
Uniform mboot.bootinst allocation code to be independent of functions order

- Always respect cylinder boundaries when creating slices unless the user
explicitly sets the geometry.
- Allow for MBR boot loaders that are longer than one sector. Only accept
boot loaders if their size is a multiple of the sector size, however.

Catch the usage() function up to the command line changes. Add -I and
remove -e.

0x39 == plan9

Obtained from: OpenBSD

Add QNX 4 partitions to fdisk's list.

PR: bin/8809
Submitted by: "John C. Place" <jcplace@ibm.net>
Prompted by: <nrahlstr@winternet.com>

Don't try to open the /dev/rXXX device.

Fix nits in previous commit: restore option ordering of the option
description list; break an overly long line; use the Fx macro instead
of "FreeBSD".

-e -> -I change.
-s for sumary

Approved by: jkh

Don't use the old raw name for disk devices.

Add ata(4) support.

Approved by: jkh

Stuff a variable declaration inside a #if block that is only used for that
#if.

$Id$ -> $FreeBSD$

Add -e option to usage().

Add new option to fdisk: -e

This wipes the MBR and creates slice 1 as a FreeBSD slice covering the
disk starting from the second track to the cylinder aligned end of the disk.

This is the most compatibly layout we have as far as I know.

Drop the embedded boot code in favour of a -B option which reads
the boot code from /boot/mbr, or elsewhere as defined by the revised
"-b bootcode" option; use getopt(3); clarify usage(); partially
revise man page; etc.

Note that a standard MBR supports booting only from hard drive 0

Add a -b option as a simple way to rewrite the mbr code
(eg. replacing a boot manager with a standard mbr)

sd0 -> da0

Add an entry for the new NetBSD partition id.

Add an entry for BSD/OS [23].x partition types.

I don't have access to a BSD/OS machine to check the veracity of the
magic number. However, no harm will be done by the commit and since
someone was motivated enough to file a PR, I'm committing the change.

PR: 7629
Submitted by: Jos Backus <jbackus@plex.nl>

Linux swap and Solaris x86 use the same BIOS partition id.

Correct use of .Nm, use .Bx Free for FreeBSD. Add rcsid, remove unused
#includes. Spelling. Use err(3) and add usage().

Fixed printf format errors.

Fix a spelling error.

PR: 6857
Submitted by: Josh Gilliam <josh@quick.net>

Fix typo in prompt.

Add NTFS partition type.
Add "." at the end of some sentances.
Also print "flag 80" in English.
Give hint that "sysid" for FreeBSD is 165 decimal.
Ensure active partition specified by user is 1-4.

Add more DOS/Win95 partition types

Oops, merge back 32bit fat description from -stable.
It was added to -stable but not to -current, strange.

Add primary fat-32

Number partitions 1-4, not 0-3.

Any existing config files (using the -f option) will need
to be changed although using the old files will usually result
in an error (partition 0 is invalid).

Don't overflow when calculating the size in MB of a partition.

No more 241MB 4+ gig partitions for me!

OpenBSD uses ID 0xa6 for its partitions on i386, arc and others that need
a BIOS-like partition table. We now detect this correctly and print the
right thing.
Obtained from: Value obtained from OpenBSD sources.

This update adds the support for != 512 byte sector SCSI devices to
the sd & od drivers. There is also slight changes to fdisk & newfs
in order to comply with different sectorsizes.
Currently sectors of size 512, 1024 & 2048 are supported, the only
restriction beeing in fdisk, which hunts for the sectorsize of
the device.
This is based on patches to od.c and the other system files by
John Gumb & Barry Scott, minor changes and the sd.c patches by
me.
There also exist some patches for the msdos filesys code, but I
havn't been able to test those (yet).

John Gumb (john@talisker.demon.co.uk)
Barry Scott (barry@scottb.demon.co.uk)

Allow fdisk to be driven from a configuration file, making a 3rd-party
utility for front-ending its operation more of a possibility.

2.2-RELEASE candiate. Closes PR#1960
Submitted-By: Darryl Okahata <darrylo@hpnmhjw.sr.hp.com>

The dos() function needs a new second argument, containing the size
of the partition. Only if the size is 0 should the
special handling of 0 as first argument be triggered.

[This bug caused offset 0 to give C/H/S = 0/0/0 instead of 0/0/1.]

The init_sector0 function needs to decrease the first argument
to the second call to dos() by one to be consistent with the
calls to dos() in change_part().

[This bug caused fdisk -i to create bogus partition tables with
the ending C/H/S value 1 too high. This usually gives S = 1
instead of S = maximum, so the geometry guessing in the slice
code and perhaps in SCSI BIOSes was defeated.]

Submitted by: Tor Egge <tegge@itea.ntnu.no>

Code clean up. Prototypes, parentheses around assignments used in
if statements, #if 0 some unused code, use off_t in calls to read/
write_disk, fix a printf format, remove unused variables, and
#include necessary files.

Fix even more spelling errors in some more man pages.

Fix the spelling of 'partition'.

remove the calls to DIOCWLABEL, as it isn't supported any more
and the error message confuses the user.
(just commented out foe now)

Update to the slices era. Make /dev/rfoo0 the defaults, not
/dev/rfoo0d.

Scan a list of devices instead of insisting on all the world
being wd0.

Allow for disk names to be specified (e.g. `sd0') instead of full
path names only.

Sync the man page with the reality.

Remove trailing whitespace.

Add NEXTSTEP as claiming partition code 0xA7.

Recognise Linux filesystems.
Submitted by: remy

Don't write outside of partp[] if the user gives an invalid partition
number for the partition to be made active. Do nothing instead. This
allows clearing all the active flags by specifying an invalid partition.

Don't change the active partition when the user says not to change it.

Convert absolute sector 0 to C/H/S 0/0/0, not 0/0/1.

Open in O_RDWR mode for the undocumented -a option, so that -a can be
used without -u.

Don't exit early if the device is not character special or if the
device driver cannot supply a label (real or faked). This allows
you to practice using fdisk on disposable media (e.g., "dd count=1
<dev/zero >/tmp/junk; fdisk /tmp/junk", "dd count=1 </etc/passwd
>/tmp/fix-up-the-mess; fdisk /tmp/fix-up-the-mess") and allows me
to test DOSpartitioning and labelling on floppies.

Fix gross spelling and typographical errors pointed out by Keith Bostic.

The fdisk man page doesn't show correctly the usage possibilities of
fdisk. It was missing the disk argument.

From: Andreas Schulz <ats@g386bsd.first.gmd.de>

New manual page system

Initial import, 0.1 + pk 0.2.4-B1