r635 - in lvm2/trunk/debian: . patches

[Bastian Blank]

Author: waldi
Date: Fri Nov 21 15:15:56 2008
New Revision: 635

Log:
* debian/changelog: Update.
* debian/lvm2.init: Ignore locking again.
* debian/patches/config.patch: Remove locking_dir change.


Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/lvm2.init
   lvm2/trunk/debian/patches/config.patch

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Fri Nov 21 15:15:56 2008
@@ -1,7 +1,6 @@
 lvm2 (2.02.39-4) UNRELEASED; urgency=low
 
-  * Set locking dir to /lib/init/rw/lvm as we need a writable array early
-    during boot. (closes: #506354)
+  * Revert locking change, it breaks too much. (closes: #506354)
   * Disable cluster support in udeb.
   * Install the binary as lvm in the initramfs. (closes: #503627)
   * Build cluster locking internal.

Modified: lvm2/trunk/debian/lvm2.init
==============================================================================
--- lvm2/trunk/debian/lvm2.init	(original)
+++ lvm2/trunk/debian/lvm2.init	Fri Nov 21 15:15:56 2008
@@ -20,13 +20,13 @@
 do_start()
 {
 	modprobe dm-mod 2> /dev/null || :
-	/sbin/vgscan --mknodes || :
-	/sbin/vgchange -aly || return 2
+	/sbin/vgscan --ignorelockingfailure --mknodes || :
+	/sbin/vgchange -aly --ignorelockingfailure || return 2
 }
 
 do_stop()
 {
-	/sbin/vgchange -aln || return 2
+	/sbin/vgchange -aln --ignorelockingfailure || return 2
 }
 
 case "$1" in

Modified: lvm2/trunk/debian/patches/config.patch
==============================================================================
--- lvm2/trunk/debian/patches/config.patch	(original)
+++ lvm2/trunk/debian/patches/config.patch	Fri Nov 21 15:15:56 2008
@@ -1,14 +1,5 @@
 --- a/doc/example.conf
 +++ b/doc/example.conf
-@@ -251,7 +251,7 @@
- 
-     # Local non-LV directory that holds file-based locks while commands are
-     # in progress.  A directory like /tmp that may get wiped on reboot is OK.
--    locking_dir = "/var/lock/lvm"
-+    locking_dir = "/lib/init/rw/lvm"
- 
-     # Other entries can go here to allow you to load shared libraries
-     # e.g. if support for LVM1 metadata was compiled as a shared library use
 @@ -259,7 +259,7 @@
      # Full pathnames can be given.