r639 - in lvm2/trunk/debian: . initramfs-tools/scripts/local-top

[Bastian Blank]

Author: waldi
Date: Fri Nov 21 18:00:45 2008
New Revision: 639

Log:
* debian/changelog: Update.
* debian/initramfs-tools/scripts/local-top/lvm2: Ignore locking.


Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/initramfs-tools/scripts/local-top/lvm2

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Fri Nov 21 18:00:45 2008
@@ -1,6 +1,7 @@
 lvm2 (2.02.39-5) UNRELEASED; urgency=low
 
   * Install lvm.conf into initramfs. (closes: #439761)
+  * Also ignore locking in initramfs.
 
  -- Bastian Blank <waldi at debian.org>  Fri, 21 Nov 2008 18:05:58 +0100
 

Modified: lvm2/trunk/debian/initramfs-tools/scripts/local-top/lvm2
==============================================================================
--- lvm2/trunk/debian/initramfs-tools/scripts/local-top/lvm2	(original)
+++ lvm2/trunk/debian/initramfs-tools/scripts/local-top/lvm2	Fri Nov 21 18:00:45 2008
@@ -27,12 +27,12 @@
 	# Take care of lilo boot arg, risky activating of all vg
 	case $vg in
 	fe[0-9]*)
-		lvm vgchange -ay
+		lvm vgchange -aly --ignorelockingfailure
 		exit 0
 		;;
 	# FIXME: check major
 	/dev/root)
-		lvm vgchange -ay
+		lvm vgchange -aly --ignorelockingfailure
 		exit 0
 		;;
 	esac
@@ -53,7 +53,7 @@
 	# Reduce padded --'s to -'s
 	vg=$(echo ${vg} | sed -e 's#--#-#g')
 
-	lvm vgchange -ay ${vg}
+	lvm vgchange -aly --ignorelockingfailure ${vg}
 }
 
 if [ ! -e /sbin/lvm ]; then