summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-02-10 23:15:14 +0000
committerroot <root@rshg054.dnsready.net>2012-02-10 23:15:14 +0000
commit9d1489b877a1fa7c2674cf1f744804db42d93bfc (patch)
tree33f1f96e0a8a2cc9a6a2939dfa0517a2ea47dcce /core
parent4bc61018eec54dbe50e7556ce01d2ef2859b2c9f (diff)
Fri Feb 10 23:15:14 UTC 2012
Diffstat (limited to 'core')
-rw-r--r--core/lvm2/PKGBUILD15
-rw-r--r--core/lvm2/lvm2_hook14
2 files changed, 13 insertions, 16 deletions
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 2bfdc78b0..8bdc641c8 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 136115 2011-08-23 03:22:03Z eric $
+# $Id: PKGBUILD 149749 2012-02-10 03:59:10Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.88
+pkgver=2.02.90
pkgrel=1
arch=('i686' 'x86_64')
url="http://sourceware.org/lvm2/"
license=('GPL2' 'LGPL2.1')
groups=('base')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
lvm2_install
lvm2_hook
11-dm-initramfs.rules)
-md5sums=('321429cd1b1526a29cf6d75018b1e4bb'
- 'dcb82506d732cc7b10159a89b579dba8'
- '8d613b84a175cd85f752a75198e40e15'
- '69e40679cd8b3658bfc619e48baae125')
-sha1sums=('05a4fb09cb5e3d680ad1b268c941968853fb1979'
+sha1sums=('de37e533e5f3af6a18c1acadd7a07ae06150d7d6'
+ '61c4b46dff520f9c178062930ea9f169019f57e6'
'7f108b2f2056eb050fc898bf5190ecf9145aed8a'
- 'a0e0513c2efb183006e57e595d93ce18be297928'
+ '7d63aa838703c9f986531a78164b556f765f5cce'
'f6a554eea9557c3c236df2943bb6e7e723945c41')
build() {
diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook
index 874b91d06..efb104998 100644
--- a/core/lvm2/lvm2_hook
+++ b/core/lvm2/lvm2_hook
@@ -4,22 +4,22 @@ run_hook ()
/sbin/modprobe -q dm-mod >/dev/null 2>&1
if [ -e "/sys/class/misc/device-mapper" ]; then
if [ ! -e "/dev/mapper/control" ]; then
+ local major minor
+ IFS=: read major minor < /sys/class/misc/device-mapper/dev
mkdir /dev/mapper
- mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |')
+ mknod "/dev/mapper/control" c ${major} ${minor}
fi
# If the lvmwait= parameter has been specified on the command line
# wait for the device(s) before trying to activate the volume group(s)
- if [ -n "${lvmwait}" ]; then
- for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do
- poll_device ${pvdev} ${rootdelay}
- done
- fi
+ for pvdev in ${lvmwait//,/ }; do
+ poll_device ${pvdev} ${rootdelay}
+ done
[ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
msg "Activating logical volumes..."
- [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit
+ [ -d /etc/lvm ] && /sbin/lvm vgscan
eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
fi
}