[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hook)

[Thomas Bächler]

    Date: Sunday, February 7, 2010 @ 05:35:01
  Author: thomas
Revision: 67457

Modified:
  lvm2/trunk/PKGBUILD
  lvm2/trunk/lvm2_hook

-----------+
 PKGBUILD  |    9 +++++----
 lvm2_hook |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-07 10:17:21 UTC (rev 67456)
+++ PKGBUILD	2010-02-07 10:35:01 UTC (rev 67457)
@@ -11,6 +11,7 @@
 url="http://sourceware.org/lvm2/"
 license=('GPL')
 groups=('base')
+conflicts=('mkinitcpio<0.5.99')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
         lvm2_install
         lvm2_hook)
@@ -20,7 +21,7 @@
          'bbc89cecc8055d25ed1f829d1308f00a25969a41')
 sha256sums=('5b9fc9daa3befb715b6930d5b788909bff881269ebbafce828a686565064abc7'
             'ab27d85635fc2fe3a1ec201418e6273aee5184a54bb2eb1d83ea9ca0d29fa1d1'
-            '511189f4c4f495097c7cde622461167974d7ea036325dc018d724c0e973f95ad')
+            '2ce0d9d535cf87d07a229b604f54e96334697327724cd571ea499220c0971fc0')
                                           
 build() {
   cd "${srcdir}/LVM2.${_pkgverlvm}"
@@ -42,9 +43,9 @@
   # install the static libraries in /usr/lib
   install -d -m755 "${pkgdir}/usr/lib"
   mv "${pkgdir}"/lib/libdevmapper.a* "${pkgdir}"/usr/lib/
-  ln -sf ../usr/lib/libdevmapper.a "${pkgdir}"/lib/libdevmapper.a
+  ln -sf ../../lib/libdevmapper.so "${pkgdir}"/usr/lib/libdevmapper.so
   mv "${pkgdir}"/lib/libdevmapper-event.a* "${pkgdir}"/usr/lib/
-  ln -sf ../usr/lib/libdevmapper-event.a "${pkgdir}"/lib/libdevmapper-event.a
+  ln -sf ../../lib/libdevmapper-event.so "${pkgdir}"/usr/lib/libdevmapper-event.so
   # install udev rules
   cd udev
   make DESTDIR="${pkgdir}" install_device-mapper || return 1
@@ -66,7 +67,7 @@
   # install the static libraries in /usr/lib
   install -d -m755 "${pkgdir}/usr/lib"
   mv "${pkgdir}"/lib/liblvm2cmd.a* "${pkgdir}"/usr/lib/
-  ln -sf ../usr/lib/liblvm2cmd.a "${pkgdir}"/lib/liblvm2cmd.a
+  ln -sf ../../lib/liblvm2cmd.so "${pkgdir}"/usr/lib/liblvm2cmd.so
   mv "${pkgdir}"/lib/liblvm2app.a* "${pkgdir}"/usr/lib/
   ln -sf ../usr/lib/liblvm2app.a "${pkgdir}"/lib/liblvm2app.a
   # /etc directories

Modified: lvm2_hook
===================================================================
--- lvm2_hook	2010-02-07 10:17:21 UTC (rev 67456)
+++ lvm2_hook	2010-02-07 10:35:01 UTC (rev 67457)
@@ -12,6 +12,6 @@
         msg "Scanning logical volumes..."
         eval /sbin/lvm vgscan --ignorelockingfailure $LVMQUIET
         msg "Activating logical volumes..."
-        eval /sbin/lvm vgchange --ignorelockingfailure -ay $LVMQUIET
+        eval /sbin/lvm vgchange --ignorelockingfailure --ignoremonitoring -ay $LVMQUIET
     fi
 }