tweaks to pv-fixup

svn path=/trunk/scripts/pv-fixup/; revision=2268

diff --git a/pv-fixup b/pv-fixup
index 78a4530..abcb494 100644 (file)
--- a/pv-fixup
+++ b/pv-fixup
@@ -52,23 +52,24 @@ totalsize () {
 }
 
 movelv () {
-  echo pvmoving $1...
-  pvmove -i 10 -n $1 $2
+  echo pvmoving $VG/$1...
+  pvmove -i 10 -n $VG/$1 $2
 }
 
 ssh root@xvm remctl remote web listvms \
- | yamlkeys
+ | yamlkeys \
  > runningvms
 LVM_SYSTEM_DIR=/root/lvm lvsleft \
  | grep '^d_.*_hda$' \
  | grep -v -xf <(vmstolvs <runningvms) \
  > offvmlvs
 for lv in $(offvmlvs); do
-  LVM_SYSTEM_DIR=/root/lvm movelv $VG/$lv $DISK
+  LVM_SYSTEM_DIR=/root/lvm movelv $lv $DISK
 done
 #FOREACH host:
-for lv in $(invirt-listvms | yamlkeys | vmstolvs); do
-  LVM_SYSTEM_DIR=/root/lvm movelv $VG/$lv $DISK
+for lv in $(invirt-listvms | yamlkeys | vmstolvs \
+             | grep -xf <(LVM_SYSTEM_DIR=/root/lvm lvsleft)); do
+  LVM_SYSTEM_DIR=/root/lvm movelv $lv $DISK
 done
 #done
 
@@ -80,7 +81,7 @@ LVM_SYSTEM_DIR=/root/lvm lvsleft \
  | grep -v -xf <(perl -pe "s|/dev/$VG/||" usedcdroms) \
  > offcdlvs
 for lv in $(offcdlvs); do
-  LVM_SYSTEM_DIR=/root/lvm movelv $VG/$lv $DISK
+  LVM_SYSTEM_DIR=/root/lvm movelv $lv $DISK
 done
 
 # deal with $(cat usedcdroms)