shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Some extra (paranoid) checks on dev_is_{md,swap} result.

Browse Source
This commit is contained in:
Petr Rockai 2009-03-17 14:00:58 +00:00
parent 3402ccd488
commit a9d72f0e9d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/pvcreate.c
View File

@ -46,6 +46,7 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name,
struct physical_volume *pv; struct physical_volume *pv;
struct device *dev; struct device *dev;
uint64_t md_superblock, swap_signature; uint64_t md_superblock, swap_signature;
int wipe_md, wipe_swap;
/* FIXME Check partition type is LVM unless --force is given */ /* FIXME Check partition type is LVM unless --force is given */
@ -117,7 +118,7 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name,
} }
/* Wipe superblock? */ /* Wipe superblock? */
if (dev_is_md(dev, &md_superblock) && if ((wipe_md = dev_is_md(dev, &md_superblock)) == 1 &&
((!pp->idp && !pp->restorefile) || pp->yes || ((!pp->idp && !pp->restorefile) || pp->yes ||
(yes_no_prompt("Software RAID md superblock " (yes_no_prompt("Software RAID md superblock "
"detected on %s. Wipe it? [y/n] ", name) == 'y'))) { "detected on %s. Wipe it? [y/n] ", name) == 'y'))) {
@ -129,7 +130,13 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name,
} }
} }
if (dev_is_swap(dev, &swap_signature) && if (wipe_md == -1) {
log_error("Fatal error while trying to detect software "
"RAID md superblock on %s", name);
return 0;
}
if ((wipe_swap = dev_is_swap(dev, &swap_signature)) == 1 &&
((!pp->idp && !pp->restorefile) || pp->yes || ((!pp->idp && !pp->restorefile) || pp->yes ||
(yes_no_prompt("Swap signature detected on %s. Wipe it? [y/n] ", (yes_no_prompt("Swap signature detected on %s. Wipe it? [y/n] ",
name) == 'y'))) { name) == 'y'))) {
@ -140,6 +147,12 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name,
} }
} }
if (wipe_swap == -1) {
log_error("Fatal error while trying to detect swap "
"signature on %s", name);
return 0;
}
if (sigint_caught()) if (sigint_caught())
return 0; return 0;