[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hotfix_udevsync.patch)

[Thomas Bächler]

    Date: Tuesday, February 1, 2011 @ 13:44:18
  Author: thomas
Revision: 108577

Add (temporary) hotfix for broken udev synchronization when --ignorelockingfailure (or --sysinit) is used.

Added:
  lvm2/trunk/lvm2_hotfix_udevsync.patch
Modified:
  lvm2/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   12 ++++++++----
 lvm2_hotfix_udevsync.patch |   16 ++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-01 18:23:31 UTC (rev 108576)
+++ PKGBUILD	2011-02-01 18:44:18 UTC (rev 108577)
@@ -6,7 +6,7 @@
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.82
 _pkgverlvm=${pkgver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -14,15 +14,19 @@
 conflicts=('mkinitcpio<0.5.99')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
         lvm2_install
-        lvm2_hook)
+        lvm2_hook
+        lvm2_hotfix_udevsync.patch)
 md5sums=('21c0ea7bb961d9340cd8bde2de5e2389' 'f781c9f5dd4f9934952c687b73d26a18'\
-         '95bed25bdbc2c2d8500e7a07aeff7f65')
+         '95bed25bdbc2c2d8500e7a07aeff7f65'
+         '438dde628a7abed5de3ea03713f05898')
 sha1sums=('fa6258c307b5da807747d2b58d3cbc9b3ac99fa1' '583424bb0a6f89ffe4e4ea446b912f0fedac7050'\
-         '0dc0c0d620f634c4d078afdb78e3bae15ccf957b')
+         '0dc0c0d620f634c4d078afdb78e3bae15ccf957b'
+         '1728f06ef116d9428bcf32037fafa08ef16c7b22')
 
 build() {
   cd "${srcdir}/LVM2.${_pkgverlvm}"
   sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
+  patch -p1 -i "${srcdir}"/lvm2_hotfix_udevsync.patch
   unset LDFLAGS
   ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
     --includedir=/usr/include --with-usrlibdir=/usr/lib \

Added: lvm2_hotfix_udevsync.patch
===================================================================
--- lvm2_hotfix_udevsync.patch	                        (rev 0)
+++ lvm2_hotfix_udevsync.patch	2011-02-01 18:44:18 UTC (rev 108577)
@@ -0,0 +1,16 @@
+--- a/lib/locking/locking.h
++++ b/lib/locking/locking.h
+@@ -143,7 +143,12 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname);
+ 		lock_vol(cmd, (lv)->lvid.s, flags | LCK_LV_CLUSTERED(lv)) : \
+ 		0)
+ 
+-#define unlock_vg(cmd, vol)	lock_vol(cmd, vol, LCK_VG_UNLOCK)
++#define unlock_vg(cmd, vol)	\
++	do {\
++		sync_local_dev_names(cmd); \
++		lock_vol(cmd, vol, LCK_VG_UNLOCK); \
++	} while (0)
++
+ #define unlock_and_free_vg(cmd, vg, vol) \
+ 	do { \
+ 		unlock_vg(cmd, vol); \</pre>