CVSROOT: /cvs
Module name: src
Changes by: k...@cvs.openbsd.org 2015/11/17 19:32:56
Modified files:
sbin/fdisk : fdisk.c
Log message:
Rejig the MBR file reading logic so
1) If mbr_file is NULL use built-in mbr for -i, -u and 'reinit'.
2) If mbr_file cannot be opened issue a warning and use built-in mbr for -i,
-u, and 'reinit'.
3) If mbr_file can't be read, bail out of fdisk.
4) Use the mbr read from mbr_file for -i, -u, and 'reinit'.
Remove inappropriate GPT dancing.
This restores pre-GPT-editing mbr_file handling and makes the logic
clearer at the expense of a tiny bit of duplication.
