prefix lvm variables with LVM_

svn-id: @12500

diff --git a/mod-lvm.sh b/mod-lvm.sh
index a2c58f80cd46b984e04467fe14313dfe0f2e23ce..60af1e6d3d73904a747b2f495fbe2de3011049d3 100644 (file)
--- a/mod-lvm.sh
+++ b/mod-lvm.sh
@@ -10,12 +10,12 @@ have_lvm=no
 # LVM volumes that are needed to activate
 # VG for root dev
 # @internal
-ROOTVG=""
+LVM_ROOTVG=""
 
 # VG for suspend resume dev
-SUSPENDVG=""
+LVM_SUSPENDVG=""
 
-VGVOLUMES=""
+LVM_VGVOLUMES=""
 
 # LVM version. Autodetected if not set.
 # Values: 1|2
@@ -87,7 +87,7 @@ find_modules_lvm() {
 
        local vg=$(find_lvm_vg "$devpath")
        debug "LVM VG for $devpath: $vg"
-       VGVOLUMES=$(echo $VGVOLUMES $vg | tr ' ' '\n' | sort -u)
+       LVM_VGVOLUMES=$(echo $LVM_VGVOLUMES $vg | tr ' ' '\n' | sort -u)
 
        local pv=$(find_lvm_pv "$vg")
        debug "LVM PV for $vg: $pv"
@@ -146,7 +146,7 @@ initrd_gen_lvm() {
        if [ "$LVMTOOLSVERSION" = "1" ]; then
                add_linuxrc <<-EOF
                        lvm vgscan -T
-                       for vg in $VGVOLUMES; do
+                       for vg in $LVM_VGVOLUMES; do
                                lvm vgchange -T -a y $vg
                        done
                EOF
@@ -182,8 +182,8 @@ initrd_gen_lvm() {
 
                add_linuxrc <<-EOF
                        ROOTDEV=$rootdev
-                       ROOTVG="$VGVOLUMES"
-                       SUSPENDVG=$SUSPENDVG
+                       LVM_ROOTVG="$LVM_VGVOLUMES"
+                       LVM_SUSPENDVG="$LVM_SUSPENDVG"
                EOF
 
                # need awk for "s/--/-/g" subst when parsing kernel root commandline
@@ -213,18 +213,18 @@ initrd_gen_lvm() {
                                        echo "LVM: Using 'root=$ROOTDEV' from kernel commandline"
                                        local tmp=${ROOTDEV#/dev/}
                                        if [ "$tmp" != "$ROOTDEV" ]; then
-                                               ROOTVG=${tmp%/*}
-                                               echo "LVM: Using Volume Group '$ROOTVG' for rootfs"
+                                               LVM_ROOTVG=${tmp%/*}
+                                               echo "LVM: Using Volume Group '$LVM_ROOTVG' for rootfs"
                                        fi
                                fi
                                ;;
                        esac
 
                        # skip duplicate VG
-                       if [ "$SUSPENDVG" = "$ROOTVG" ]; then
-                               VGVOLUMES="$ROOTVG"
+                       if [ "$LVM_SUSPENDVG" = "$LVM_ROOTVG" ]; then
+                               LVM_VGVOLUMES="$LVM_ROOTVG"
                        else
-                               VGVOLUMES="$SUSPENDVG $ROOTVG"
+                               LVM_VGVOLUMES="$LVM_SUSPENDVG $LVM_ROOTVG"
                        fi
 
                        # disable noise from LVM accessing devices that aren't ready.
@@ -238,7 +238,7 @@ initrd_gen_lvm() {
                        lvm.static vgscan --mknodes --ignorelockingfailure 2>/dev/null
 
                        : 'Activating Volume Groups'
-                       for vol in $VGVOLUMES; do
+                       for vol in $LVM_VGVOLUMES; do
                                lvm.static vgchange --ignorelockingfailure -a y $vol 2>/dev/null
                        done
 

diff --git a/mod-suspend.sh b/mod-suspend.sh
index c15f4c703d4c8e1754a3a8d74c3af79a29b51df5..b4aece98095d1c3ca26fef816c627a4f487c5afd 100644 (file)
--- a/mod-suspend.sh
+++ b/mod-suspend.sh
@@ -27,13 +27,15 @@ setup_mod_suspend() {
 find_modules_suspend() {
        resume_dev="$(awk '/^resume device =/ { print $4 } ' /etc/suspend.conf)"
 
-       local vgvolumes=$VGVOLUMES
+       # save state
+       local vgvolumes=$LVM_VGVOLUMES
        find_modules_for_devpath $resume_dev
 
-       if [ "$VGVOLUMES" != "$vgvolumes" ]; then
-               # save our VG to be able to differenciate between rootfs VG
-               SUSPENDVG=$VGVOLUMES
-               VGVOLUMES=$vgvolumes
+       # check for saved state, differenciate between rootfs VG
+       if [ "$LVM_VGVOLUMES" != "$vgvolumes" ]; then
+               # save suspend VG int oseparate var
+               LVM_SUSPENDVG=$LVM_VGVOLUMES
+               LVM_VGVOLUMES=$vgvolumes
                debug "suspend device is on LVM"
        fi
 }