Commit aa0387eb authored by abveritas's avatar abveritas

device-mapper/lvm2 update, requested by admiral

parent dfb9c204
# needed with new udev/mkinitcpio and as implemented in dracut:
# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
Do not issue an error message when unable to remove .cache on read-only fs.
===================================================================
RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- LVM2/lib/filters/filter-persistent.c 2011/04/22 12:05:33 1.49
+++ LVM2/lib/filters/filter-persistent.c 2011/05/12 12:42:48 1.50
@@ -108,7 +108,7 @@
log_very_verbose("Obtaining device list from "
"udev. Removing obolete %s.",
pf->file);
- if (unlink(pf->file) < 0)
+ if (unlink(pf->file) < 0 && errno != EROFS)
log_sys_error("unlink", pf->file);
}
return 1;
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
pkgver=2.02.84
pkgver=2.02.85
_pkgverlvm=${pkgver}
pkgrel=1
arch=('i686' 'x86_64')
......@@ -19,15 +19,24 @@ groups=('base')
conflicts=('mkinitcpio<0.5.99')
source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
lvm2_install
lvm2_hook)
md5sums=('8b4e0897ee48f02c0dff11940e44e23b' 'e29bc80d636ed17b617d9b384a5f3aa0'\
'7103e3fef1180478811ac4e32aec540d')
sha1sums=('6d92f4474f93c7d3824a0eb3469c7e4f9ef8f1d4' '662fc54ce291fd79bd09701e4c3e10854f325282'\
'769767d84c73674cbb68c765460e57c428c314a0')
lvm2_hook
Be-quiet-on-removing-cache-on-read-only-fs.diff
11-dm-initramfs.rules)
md5sums=('91785ca438e5ce679dd3a386b183d552'
'9fbe01c6e3fca4634b4a38ecdc2f562f'
'cf05f2c7281e24269ea9dcc6b4e106ba'
'6db89da27928d2415a8e26cd0a842712'
'69e40679cd8b3658bfc619e48baae125')
sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7'
'3f11db76189bcbc32d6b16a1b05ca3499e3e7b47'
'1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440'
'6d7dd04be291d7537235704c816a701fd5beacc0'
'f6a554eea9557c3c236df2943bb6e7e723945c41')
build() {
cd "${srcdir}/LVM2.${_pkgverlvm}"
sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff
unset LDFLAGS
./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
--includedir=/usr/include --with-usrlibdir=/usr/lib \
......@@ -43,35 +52,8 @@ package_device-mapper() {
cd "${srcdir}/LVM2.${_pkgverlvm}"
make DESTDIR="${pkgdir}" install_device-mapper
}
package_lvm2() {
pkgdesc="Logical Volume Manager 2 utilities"
depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
conflicts=('lvm' 'mkinitcpio<0.5.99')
backup=('etc/lvm/lvm.conf')
options=('!makeflags')
cd "${srcdir}/LVM2.${_pkgverlvm}"
make DESTDIR="${pkgdir}" install_lvm2
# install applib
cd liblvm
make DESTDIR="${pkgdir}" install
cd ..
# /etc directories
install -d "${pkgdir}"/etc/lvm/{archive,backup}
# mkinitcpio hook
install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2"
install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2"
}
package_device-mapper() {
pkgdesc="Device mapper userspace library and tools"
url="http://sourceware.org/dm/"
depends=('glibc' 'udev')
cd "${srcdir}/LVM2.${_pkgverlvm}"
make DESTDIR="${pkgdir}" install_device-mapper
# extra udev rule for device-mapper in initramfs
install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules"
}
package_lvm2() {
......
......@@ -18,6 +18,7 @@ run_hook ()
[ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
msg "Activating logical volumes..."
[ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit
eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
fi
}
......@@ -14,6 +14,7 @@ install ()
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"
add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
}
help ()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment