[Ovirt-devel] [PATCH node] Cleanup ROOTDRIVE when partitioning

[Mike Burns]

Previously, we only cleaned up the HOSTVGDRIVE.  We should clean up
ROOTDRIVE as well to remove any existing PV/VGs.

Signed-off-by: Mike Burns <mburns at redhat.com>
---
 scripts/ovirt-config-storage |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage
index 1e81db0..4117b7a 100755
--- a/scripts/ovirt-config-storage
+++ b/scripts/ovirt-config-storage
@@ -552,7 +552,7 @@ wipe_lvm_on_disk()
     if [[ "$dev" =~ "/dev/sd" ]]; then
         part_delim=""
     fi
-    for vg in $(pvs -o vg_name --noheadings $HOSTVGDRIVE $HOSTVGDRIVE${dev_delim}[0-9]* 2>/dev/null|sort -u); do
+    for vg in $(pvs -o vg_name --noheadings $dev $dev${dev_delim}[0-9]* 2>/dev/null|sort -u); do
         if pvs -o pv_name,vg_name --noheadings | \
             grep $vg | egrep -v -q "${dev}${part_delim}[0-9]+|${dev}" 2>/dev/null; then
             log "The volume group \"$vg\" spans multiple disks."
@@ -593,7 +593,8 @@ perform_partitioning()
     unmount_config /etc/default/ovirt

     log "Removing old LVM partitions"
-    wipe_lvm_on_disk
+    wipe_lvm_on_disk $HOSTVGDRIVE
+    wipe_lvm_on_disk $ROOTDRIVE

     # begin critical section
     set -e
-- 
1.6.6.1