Date: Friday, February 5, 2010 @ 17:51:54 Author: thomas Revision: 67244
Prepare for mkinitcpio 0.6 Modified: lvm2/trunk/PKGBUILD lvm2/trunk/lvm2_hook lvm2/trunk/lvm2_install --------------+ PKGBUILD | 11 ++++------- lvm2_hook | 7 +++---- lvm2_install | 8 +++++++- 3 files changed, 14 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-02-05 22:22:41 UTC (rev 67243) +++ PKGBUILD 2010-02-05 22:51:54 UTC (rev 67244) @@ -6,7 +6,7 @@ pkgver=2.02.60 _pkgverdm=1.02.40 _pkgverlvm=${pkgver} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL') @@ -15,11 +15,8 @@ lvm2_install lvm2_hook) sha256sums=('5b9fc9daa3befb715b6930d5b788909bff881269ebbafce828a686565064abc7' - '4767758e63aca392d762ac6899fcf662758ea3232cf1a9a0ecb7129184cf96a1' - 'b7682e4dd2512fad8fd57fc1f3a1c72144f401ea122af924629e72cda05fd5af') -md5sums=('33e0e0f4b4582d495ff619696c634b2a' - 'a28ae1f1bcb78347da4c43c669601229' - 'd6f3ca901747c386aa0d842e9ea64413') + 'ab27d85635fc2fe3a1ec201418e6273aee5184a54bb2eb1d83ea9ca0d29fa1d1' + '511189f4c4f495097c7cde622461167974d7ea036325dc018d724c0e973f95ad') build() { cd "${srcdir}/LVM2.${_pkgverlvm}" @@ -52,7 +49,7 @@ package_lvm2() { pkgdesc="Logical Volume Manager 2 utilities" depends=('bash' "device-mapper>=${_pkgverdm}") - conflicts=('lvm') + conflicts=('lvm' 'mkinitcpio<0.5.99') backup=('etc/lvm/lvm.conf') options=('!makeflags') Modified: lvm2_hook =================================================================== --- lvm2_hook 2010-02-05 22:22:41 UTC (rev 67243) +++ lvm2_hook 2010-02-05 22:51:54 UTC (rev 67244) @@ -3,16 +3,15 @@ { /sbin/modprobe -q dm-mod >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then - read dev_t < /sys/class/misc/device-mapper/dev if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(/bin/replace "${dev_t}" ':') + /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" msg "Scanning logical volumes..." - eval /bin/lvm vgscan --ignorelockingfailure $LVMQUIET + eval /sbin/lvm vgscan --ignorelockingfailure $LVMQUIET msg "Activating logical volumes..." - eval /bin/lvm vgchange --ignorelockingfailure -ay $LVMQUIET + eval /sbin/lvm vgchange --ignorelockingfailure -ay $LVMQUIET fi } Modified: lvm2_install =================================================================== --- lvm2_install 2010-02-05 22:22:41 UTC (rev 67243) +++ lvm2_install 2010-02-05 22:51:54 UTC (rev 67244) @@ -8,7 +8,13 @@ SCRIPT="lvm2" add_dir "/dev/mapper" - add_file "/sbin/lvm.static" "/bin/lvm" + add_binary "/sbin/lvm" + add_binary "/sbin/dmsetup" + add_binary "/sbin/dmeventd" + add_file "/lib/udev/rules.d/10-dm.rules" + add_file "/lib/udev/rules.d/13-dm-disk.rules" + add_file "/lib/udev/rules.d/95-dm-notify.rules" + add_file "/lib/udev/rules.d/11-dm-lvm.rules" } help ()