SVN: geninitrd/trunk/mod-lvm.sh

[glen]

Author: glen
Date: Mon Mar 19 20:34:11 2012
New Revision: 12504

Modified:
   geninitrd/trunk/mod-lvm.sh
Log:
cosmetics

Modified: geninitrd/trunk/mod-lvm.sh
==============================================================================
--- geninitrd/trunk/mod-lvm.sh	(original)
+++ geninitrd/trunk/mod-lvm.sh	Mon Mar 19 20:34:11 2012
@@ -151,15 +151,16 @@
 			done
 		EOF
 	else
-		echo "cat /etc/lvm.conf > /tmp/lvm.conf" | add_linuxrc
-		echo "global {" > "$DESTDIR/etc/lvm.conf"
-		echo "	locking_type = 0" >> "$DESTDIR/etc/lvm.conf"
-		echo "	locking_dir = \"/tmp\"" >> "$DESTDIR/etc/lvm.conf"
-		echo "}" >> "$DESTDIR/etc/lvm.conf"
-		echo "devices {" >> "$DESTDIR/etc/lvm.conf"
-		echo "	sysfs_scan=0" >> "$DESTDIR/etc/lvm.conf"
+		cat <<-EOF > "$DESTDIR/etc/lvm.conf"
+		global {
+			locking_type = 0
+			locking_dir = "/tmp"
+		}
+		devices {
+			sysfs_scan=0
+		EOF
 		if is_yes "$have_md"; then
-			echo "	md_component_detection = 1" >> "$DESTDIR/etc/lvm.conf"
+			echo "	md_component_detection=1" >> "$DESTDIR/etc/lvm.conf"
 		fi
 		if is_yes "$have_dmraid" || is_yes "$have_multipath"; then
 			echo '	types = [ "device-mapper", 254 ]' >> "$DESTDIR/etc/lvm.conf"
@@ -178,6 +179,8 @@
 		$lvm dumpconfig | awk '/filter=/' >> "$DESTDIR/etc/lvm.conf"
 		echo "}" >> "$DESTDIR/etc/lvm.conf"
 
+		echo "cat /etc/lvm.conf > /tmp/lvm.conf" | add_linuxrc
+
 		initrd_gen_devices
 
 		add_linuxrc <<-EOF