ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wipefs: don't erase nested partition tables by default 

It's possible the partition contains a partition table (BSD, or hybrid
boot images). It could be unexpected for users that the lost all (or
another) partitions when work with non-whole disk device. Let's
require --force.

For example:

 # wipefs --all /dev/sdb

erases all including partition table, but on hybrid disk where the
first partition starts at first sector (so partition table is within
the first partition):

 # wipefs --all /dev/sdb1
 /dev/sdb1: ignore nested "dos" partition table on non-whole disk device
 wipefs: Use the --force option to force erase.

asks for --force.

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1077310
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-04-24 13:42:54 +02:00
parent c425353570
commit 24ed078184
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
misc-utils/wipefs.8
View File

@ -37,6 +37,11 @@ table will still be visible by another magic string on another offset.
When used with option \fB-a\fR, all magic strings that are visible for libblkid are
erased.
Note that by default
.B wipefs
does not erase nested partition tables on non-whole disk devices. The option
\-\-force is required.
.SH OPTIONS
.TP
.BR \-a , " \-\-all"

14
misc-utils/wipefs.c
View File

@ -365,7 +365,7 @@ static void rereadpt(int fd, const char *devname)
static struct wipe_desc *
do_wipe(struct wipe_desc *wp, const char *devname, int flags)
{
int mode = O_RDWR, reread = 0;
int mode = O_RDWR, reread = 0, need_force = 0;
blkid_probe pr;
struct wipe_desc *w, *wp0;
int zap = (flags & WP_FL_ALL) ? 1 : wp->zap;
@ -405,6 +405,15 @@ do_wipe(struct wipe_desc *wp, const char *devname, int flags)
if (!wp->on_disk)
continue;
if (!(flags & WP_FL_FORCE)
&& wp->is_parttable
&& !blkid_probe_is_wholedisk(pr)) {
warnx(_("%s: ignore nested \"%s\" partition "
"table on non-whole disk device."), devname, wp->type);
need_force = 1;
continue;
}
if (zap) {
if (backup)
do_backup(wp, backup);
@ -419,6 +428,9 @@ do_wipe(struct wipe_desc *wp, const char *devname, int flags)
warnx(_("%s: offset 0x%jx not found"), devname, w->offset);
}
if (need_force)
warnx(_("Use the --force option to force erase."));
fsync(blkid_probe_get_fd(pr));
if (reread && (mode & O_EXCL))