From: Harald Hoyer <harald@redhat.com>
Date: Fri, 17 Jul 2009 08:13:33 +0000 (+0200)
Subject: lvm_scan: do not overwrite a preexisting /etc/lvm/lvm.conf
X-Git-Tag: 0.5~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=376cfd1c27533fcd1a2716e703d1ac50454bac4c;p=platform%2Fupstream%2Fdracut.git

lvm_scan: do not overwrite a preexisting /etc/lvm/lvm.conf
---

diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
index 81c48c0..966f909 100755
--- a/modules.d/90lvm/lvm_scan.sh
+++ b/modules.d/90lvm/lvm_scan.sh
@@ -14,19 +14,24 @@ if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
 	    echo -n "${f##/tmp/.lvm_scan-} "
 	done
 	)
-    {
-	echo 'devices {';
-	echo -n '    filter = [ '
-	for dev in $lvmdevs; do
-	    printf '"a|^/dev/%s$|", ' $dev;
-	done;
-	echo '"r/.*/" ]';
-	echo 'types = [ "blkext", 1024 ]'
-	echo '}';	  
-    } > /etc/lvm/lvm.conf
 
+    if [ ! -e /etc/lvm/lvm.conf ]; then 
+        {
+	    echo 'devices {';
+	    echo -n '    filter = [ '
+	    for dev in $lvmdevs; do
+		printf '"a|^/dev/%s$|", ' $dev;
+	    done;
+	    echo '"r/.*/" ]';
+	    echo 'types = [ "blkext", 1024 ]'
+	    echo '}';	  
+        } > /etc/lvm/lvm.conf
+	lvmwritten=1
+    fi
     info "Scanning devices $lvmdevs for LVM volume groups $VGS"
     lvm vgscan 2>&1 | vinfo
     lvm vgchange -ay $VGS 2>&1 | vinfo
+    [ "$lvmwritten" ] && rm -f /etc/lvm/lvm.conf
+    unset lvmwritten
 fi