r934 - in trunk/utils/initrd-tools: . debian

[Martin Michlmayr]

Author: tbm
Date: 2004-07-27 07:41:07 -0600 (Tue, 27 Jul 2004)
New Revision: 934

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
Log:
Don't fail if root is on LVM and "command_names = 1" is set in
/etc/lvm/lvm.conf.  Thanks to Herbert Xu (closes: #250696).


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2004-07-27 08:37:54 UTC (rev 933)
+++ trunk/utils/initrd-tools/debian/changelog	2004-07-27 13:41:07 UTC (rev 934)
@@ -3,6 +3,8 @@
   * Martin Michlmayr
     - Add support for user mode linux (UML) ubd devices, thanks to Matt
       Zimmerman (closes: #257373).
+    - Don't fail if root is on LVM and "command_names = 1" is set in
+      /etc/lvm/lvm.conf.  Thanks to Herbert Xu (closes: #250696).
   * Joshua Kwan
     - Clean up rules a little bit.
     - Apply my own patch to fall back on /proc/self/fd if /dev/fd is not

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2004-07-27 08:37:54 UTC (rev 933)
+++ trunk/utils/initrd-tools/mkinitrd	2004-07-27 13:41:07 UTC (rev 934)
@@ -218,6 +218,7 @@
 
 lvmdetect2() {
 	eval "$(vgdisplay -v | awk '
+		/^vgdisplay/ { $0 = substr($0, 10) }
 		found < 1 {
 			if (/^ *LV Name/) {
 				lvname = $3