SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Thu Oct 19 18:23:02 2006
New Revision: 7879

Modified:
   geninitrd/trunk/geninitrd
Log:
Less noise when initializing LVM2.

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Thu Oct 19 18:23:02 2006
@@ -698,7 +698,7 @@
 	for mod in $modules; do
 		MODULEDIR="`dirname "$mod"`"
 		mkdir -p "$MNTIMAGE/lib/modules/$kernel/$MODULEDIR"
-		cp $verbose -a "/lib/modules/$kernel/$mod" "$MNTIMAGE/lib/modules/$kernel/$mod"
+		cp -a "/lib/modules/$kernel/$mod" "$MNTIMAGE/lib/modules/$kernel/$mod"
 		gunzip "$MNTIMAGE/lib/modules/$kernel/$mod" 2> /dev/null
 	done
 }
@@ -1344,6 +1344,7 @@
 
 		cat <<-EOF >> "$s"
 		: 'Making device nodes'
+		set +x
 		(
 		# ignore first two lines, header and empty line
 		read a
@@ -1353,16 +1354,19 @@
 		done
 		) < /proc/partitions
 
-		: 'Scanning for Volume Groups'
-		# I hate that noise.
-		PRINTK=\$(cat /proc/sys/kernel/printk)
+		# disable noise from lvm accessing devices that aren't ready.
+		printk=\$(cat /proc/sys/kernel/printk)
 		echo 0 > /proc/sys/kernel/printk
+		set -x
+
+		: 'Scanning for Volume Groups'
 		LVM_SYSTEM_DIR=/tmp lvm vgscan --ignorelockingfailure 2>/dev/null
-		echo "\$PRINTK" > /proc/sys/kernel/printk
 
 		: 'Activating Volume Groups'
 		LVM_SYSTEM_DIR=/tmp lvm vgchange --ignorelockingfailure -a y $VGVOLUME 2>/dev/null
 
+		echo "\$printk" > /proc/sys/kernel/printk
+
 		# Find out major/minor
 		majmin="\$(LVM_SYSTEM_DIR=/tmp lvm lvdisplay --ignorelockingfailure -c $org_rootdev 2>/dev/null)"
 		majmin="\${majmin#*/}"