[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hook)
Date: Wednesday, July 13, 2016 @ 09:34:31
Author: eworm
Revision: 271827
upgpkg: lvm2 2.02.160-2
* change source url (FS#49381)
* make lvmlocal.conf a backup file (FS#47232)
* for lvm2 hook (non-systemd initramfs) add a late hook with simple loop
to wait for pvscan processes to finish (FS#41833)
Modified:
lvm2/trunk/PKGBUILD
lvm2/trunk/lvm2_hook
---+
PKGBUILD |9 +
lvm2_hook | 13 +
2 files changed, 18 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-07-13 07:30:25 UTC (rev 271826)
+++ PKGBUILD2016-07-13 09:34:31 UTC (rev 271827)
@@ -5,13 +5,13 @@
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
pkgver=2.02.160
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://sourceware.org/lvm2/";
license=('GPL2' 'LGPL2.1')
makedepends=('systemd' 'thin-provisioning-tools')
groups=('base')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
+source=(ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${pkgver}.tgz{,.asc}
lvm2_install
lvm2_hook
sd-lvm2_install
@@ -20,7 +20,7 @@
sha1sums=('7281dba2a295d13efe854ad06c0baf06c2ae476b'
'SKIP'
'5aedf7b606f6b4bd7a27126854a371e59009eb8c'
- 'ff0fdf0a3005a41acd4b36865056109effc3474b'
+ '81fc438356216abdaead0742555e1719e6ff3127'
'6bf33bd104dcc146b86cb397b1cd904b5ee896f3'
'f6a554eea9557c3c236df2943bb6e7e723945c41'
'b084512af42f2e16cdccd8b7ee4de27b574d1f94')
@@ -78,7 +78,8 @@
pkgdesc="Logical Volume Manager 2 utilities"
depends=('bash' "device-mapper>=${pkgver}" 'systemd' 'readline'
'thin-provisioning-tools')
conflicts=('lvm' 'mkinitcpio<0.7')
- backup=('etc/lvm/lvm.conf')
+ backup=('etc/lvm/lvm.conf'
+'etc/lvm/lvmlocal.conf')
options=('!makeflags')
install=lvm2.install
Modified: lvm2_hook
===
--- lvm2_hook 2016-07-13 07:30:25 UTC (rev 271826)
+++ lvm2_hook 2016-07-13 09:34:31 UTC (rev 271827)
@@ -5,6 +5,19 @@
lvmetad
}
+# We are suffering a race condition in non-systemd initramfs: If lvmetad is
+# killed before pvscan processes finish we have stale processes and
+# uninitialized physical volumes. So wait for pvscan processes to finish.
+# Break after 10 seconds (50*0.2s) to avaid infinite loop.
+run_latehook() {
+local i=50
+
+while pgrep -f pvscan >/dev/null 2>/dev/null && [ $i -gt 0 ]; do
+sleep 0.2
+i=$((i - 1))
+done
+}
+
run_cleanuphook() {
kill $(cat /run/lvmetad.pid)
}
[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hook lvm2_install)
Date: Wednesday, October 31, 2012 @ 20:19:25
Author: thomas
Revision: 170084
lvm2: Add autoactivation in initramfs
Modified:
lvm2/trunk/PKGBUILD
lvm2/trunk/lvm2_hook
lvm2/trunk/lvm2_install
--+
PKGBUILD |4 ++--
lvm2_hook| 24 ++--
lvm2_install | 10 --
3 files changed, 12 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-31 23:45:20 UTC (rev 170083)
+++ PKGBUILD2012-11-01 00:19:25 UTC (rev 170084)
@@ -22,8 +22,8 @@
lvmetad.socket)
sha1sums=('077425115b164c335a9930df745943e9ea666a8a'
'4713c852fc668e6fbd36ff7c6b5675b10a95a0f8'
- '3e1680f9b76ce9150d08865d99db90fd15532271'
- 'cedc9948123c870f9c5aa3357d0075b41a9c8135'
+ '2960759b411e93fb2377b6a259eb71d426b51dd9'
+ 'ff0fdf0a3005a41acd4b36865056109effc3474b'
'f6a554eea9557c3c236df2943bb6e7e723945c41'
'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
'8bc78727dc3a15243eec72032688b5b65689bc5b'
Modified: lvm2_hook
===
--- lvm2_hook 2012-10-31 23:45:20 UTC (rev 170083)
+++ lvm2_hook 2012-11-01 00:19:25 UTC (rev 170084)
@@ -1,24 +1,12 @@
#!/usr/bin/ash
-run_hook() {
-local pvdev
+run_earlyhook() {
+mkdir /run/lvm
+lvmetad
+}
-modprobe -q dm-mod >/dev/null 2>&1
-
-# If the lvmwait= parameter has been specified on the command line
-# wait for the device(s) before trying to activate the volume group(s)
-for pvdev in ${lvmwait//,/ }; do
-poll_device ${pvdev} ${rootdelay}
-done
-
-msg "Activating logical volumes..."
-[ -d /etc/lvm ] && lvm vgscan
-
-if [ -n "$quiet" ]; then
- lvm vgchange --sysinit -a y >/dev/null
-else
- lvm vgchange --sysinit -a y
-fi
+run_cleanuphook() {
+kill $(cat /run/lvmetad.pid)
}
# vim: set ft=sh ts=4 sw=4 et:
Modified: lvm2_install
===
--- lvm2_install2012-10-31 23:45:20 UTC (rev 170083)
+++ lvm2_install2012-11-01 00:19:25 UTC (rev 170084)
@@ -7,24 +7,22 @@
done
add_binary "/sbin/lvm"
+add_binary "/sbin/lvmetad"
add_binary "/sbin/dmsetup"
add_file "/usr/lib/udev/rules.d/10-dm.rules"
add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+add_file "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules"
"/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+add_file "/etc/lvm/lvm.conf"
add_runscript
}
help() {
cat <
[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hook lvm2_install)
Date: Friday, May 25, 2012 @ 20:57:49
Author: dreisner
Revision: 159663
upgpkg: lvm2 2.02.95-5
- rebuild for libudev soname bump
- cleanup mkinitcpio runtime hook
- update install hook for mkinitcpio 0.9.0 changes
Modified:
lvm2/trunk/PKGBUILD
lvm2/trunk/lvm2_hook
lvm2/trunk/lvm2_install
--+
PKGBUILD |6 +++---
lvm2_hook| 39 +++
lvm2_install | 32 +---
3 files changed, 39 insertions(+), 38 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-05-26 00:49:53 UTC (rev 159662)
+++ PKGBUILD2012-05-26 00:57:49 UTC (rev 159663)
@@ -5,7 +5,7 @@
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
pkgver=2.02.95
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url="http://sourceware.org/lvm2/";
license=('GPL2' 'LGPL2.1')
@@ -16,8 +16,8 @@
11-dm-initramfs.rules)
sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
'45f5e31045065e7bdf5d6f2e21c857b4978024b4'
- '08007f13cf1a9caf6e4aca76dd2ed6a4ab037601'
- '7d63aa838703c9f986531a78164b556f765f5cce'
+ '3e1680f9b76ce9150d08865d99db90fd15532271'
+ 'cedc9948123c870f9c5aa3357d0075b41a9c8135'
'f6a554eea9557c3c236df2943bb6e7e723945c41')
build() {
Modified: lvm2_hook
===
--- lvm2_hook 2012-05-26 00:49:53 UTC (rev 159662)
+++ lvm2_hook 2012-05-26 00:57:49 UTC (rev 159663)
@@ -1,25 +1,24 @@
-# vim:set ft=sh:
-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 ${major} ${minor}
-fi
+#!/usr/bin/ash
-# If the lvmwait= parameter has been specified on the command line
-# wait for the device(s) before trying to activate the volume group(s)
-for pvdev in ${lvmwait//,/ }; do
-poll_device ${pvdev} ${rootdelay}
-done
+run_hook() {
+local pvdev
-[ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
+modprobe -q dm-mod >/dev/null 2>&1
-msg "Activating logical volumes..."
-[ -d /etc/lvm ] && /sbin/lvm vgscan
-eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
+# If the lvmwait= parameter has been specified on the command line
+# wait for the device(s) before trying to activate the volume group(s)
+for pvdev in ${lvmwait//,/ }; do
+poll_device ${pvdev} ${rootdelay}
+done
+
+msg "Activating logical volumes..."
+[ -d /etc/lvm ] && lvm vgscan
+
+if [ -n "$quiet" ]; then
+ lvm vgchange --sysinit -a y >/dev/null
+else
+ lvm vgchange --sysinit -a y
fi
}
+
+# vim: set ft=sh ts=4 sw=4 et:
Modified: lvm2_install
===
--- lvm2_install2012-05-26 00:49:53 UTC (rev 159662)
+++ lvm2_install2012-05-26 00:57:49 UTC (rev 159663)
@@ -1,11 +1,10 @@
-# vim: set ft=sh:
+#!/bin/bash
-build()
-{
-MODULES=" dm-mod dm-snapshot dm-mirror"
-BINARIES=""
-FILES=""
-SCRIPT="lvm2"
+build() {
+local mod
+for mod in dm-mod dm-snapshot dm-mirror; do
+add_module "$mod"
+done
add_binary "/sbin/lvm"
add_binary "/sbin/dmsetup"
@@ -14,16 +13,19 @@
add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules"
"/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+add_runscript
}
-help ()
-{
-cat<
[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hook)
Date: Sunday, February 5, 2012 @ 22:08:25
Author: eric
Revision: 149162
upgpkg: lvm2 2.02.90-1
Upstream update, Remove sed usage in initcpio hook (close FS#27307)
Modified:
lvm2/trunk/PKGBUILD
lvm2/trunk/lvm2_hook
---+
PKGBUILD | 13 +
lvm2_hook | 12 ++--
2 files changed, 11 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-02-06 02:15:27 UTC (rev 149161)
+++ PKGBUILD2012-02-06 03:08:25 UTC (rev 149162)
@@ -4,23 +4,20 @@
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() {
Modified: lvm2_hook
===
--- lvm2_hook 2012-02-06 02:15:27 UTC (rev 149161)
+++ lvm2_hook 2012-02-06 03:08:25 UTC (rev 149162)
@@ -4,17 +4,17 @@
/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"
[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hook lvm2_install)
Date: Thursday, June 30, 2011 @ 13:54:05
Author: thomas
Revision: 129975
lvm2: Adjust mkinitcpio install hook for mkinitcpio 0.7 (build()->install())
Modified:
lvm2/trunk/PKGBUILD
lvm2/trunk/lvm2_hook
lvm2/trunk/lvm2_install
--+
PKGBUILD | 13 ++---
lvm2_hook|3 ++-
lvm2_install |3 +--
3 files changed, 9 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-30 17:38:12 UTC (rev 129974)
+++ PKGBUILD2011-06-30 17:54:05 UTC (rev 129975)
@@ -6,25 +6,24 @@
pkgname=('lvm2' 'device-mapper')
pkgver=2.02.85
_pkgverlvm=${pkgver}
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://sourceware.org/lvm2/";
license=('GPL2' 'LGPL2.1')
groups=('base')
-conflicts=('mkinitcpio<0.5.99')
source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
lvm2_install
lvm2_hook
Be-quiet-on-removing-cache-on-read-only-fs.diff
11-dm-initramfs.rules)
md5sums=('91785ca438e5ce679dd3a386b183d552'
- '9fbe01c6e3fca4634b4a38ecdc2f562f'
- 'cf05f2c7281e24269ea9dcc6b4e106ba'
+ 'dcb82506d732cc7b10159a89b579dba8'
+ '8d613b84a175cd85f752a75198e40e15'
'6db89da27928d2415a8e26cd0a842712'
'69e40679cd8b3658bfc619e48baae125')
sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7'
- '3f11db76189bcbc32d6b16a1b05ca3499e3e7b47'
- '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440'
+ '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
+ 'a0e0513c2efb183006e57e595d93ce18be297928'
'6d7dd04be291d7537235704c816a701fd5beacc0'
'f6a554eea9557c3c236df2943bb6e7e723945c41')
@@ -54,7 +53,7 @@
package_lvm2() {
pkgdesc="Logical Volume Manager 2 utilities"
depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
- conflicts=('lvm' 'mkinitcpio<0.5.99')
+ conflicts=('lvm' 'mkinitcpio<0.7')
backup=('etc/lvm/lvm.conf')
options=('!makeflags')
Modified: lvm2_hook
===
--- lvm2_hook 2011-06-30 17:38:12 UTC (rev 129974)
+++ lvm2_hook 2011-06-30 17:54:05 UTC (rev 129975)
@@ -4,7 +4,8 @@
/sbin/modprobe -q dm-mod >/dev/null 2>&1
if [ -e "/sys/class/misc/device-mapper" ]; then
if [ ! -e "/dev/mapper/control" ]; then
-/bin/mknod "/dev/mapper/control" c $(cat
/sys/class/misc/device-mapper/dev | sed 's|:| |')
+mkdir /dev/mapper
+mknod "/dev/mapper/control" c $(cat
/sys/class/misc/device-mapper/dev | sed 's|:| |')
fi
# If the lvmwait= parameter has been specified on the command line
Modified: lvm2_install
===
--- lvm2_install2011-06-30 17:38:12 UTC (rev 129974)
+++ lvm2_install2011-06-30 17:54:05 UTC (rev 129975)
@@ -1,13 +1,12 @@
# vim: set ft=sh:
-install ()
+build()
{
MODULES=" dm-mod dm-snapshot dm-mirror"
BINARIES=""
FILES=""
SCRIPT="lvm2"
-add_dir "/dev/mapper"
add_binary "/sbin/lvm"
add_binary "/sbin/dmsetup"
add_file "/lib/udev/rules.d/10-dm.rules"
[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hook lvm2_install)
Date: Tuesday, February 1, 2011 @ 13:56:47
Author: thomas
Revision: 108578
Simplify lvm2 hook
- Remove vgscan, it happens automatically (and no cache files are in initramfs)
- Use --sysinit
- Do not install dmeventd, it is only needed for monitoring, which we start
later
Modified:
lvm2/trunk/PKGBUILD
lvm2/trunk/lvm2_hook
lvm2/trunk/lvm2_install
--+
PKGBUILD |8
lvm2_hook|4 +---
lvm2_install |1 -
3 files changed, 5 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-01 18:44:18 UTC (rev 108577)
+++ PKGBUILD2011-02-01 18:56:47 UTC (rev 108578)
@@ -16,11 +16,11 @@
lvm2_install
lvm2_hook
lvm2_hotfix_udevsync.patch)
-md5sums=('21c0ea7bb961d9340cd8bde2de5e2389' 'f781c9f5dd4f9934952c687b73d26a18'\
- '95bed25bdbc2c2d8500e7a07aeff7f65'
+md5sums=('21c0ea7bb961d9340cd8bde2de5e2389' 'e29bc80d636ed17b617d9b384a5f3aa0'\
+ '7103e3fef1180478811ac4e32aec540d'
'438dde628a7abed5de3ea03713f05898')
-sha1sums=('fa6258c307b5da807747d2b58d3cbc9b3ac99fa1'
'583424bb0a6f89ffe4e4ea446b912f0fedac7050'\
- '0dc0c0d620f634c4d078afdb78e3bae15ccf957b'
+sha1sums=('fa6258c307b5da807747d2b58d3cbc9b3ac99fa1'
'662fc54ce291fd79bd09701e4c3e10854f325282'\
+ '769767d84c73674cbb68c765460e57c428c314a0'
'1728f06ef116d9428bcf32037fafa08ef16c7b22')
build() {
Modified: lvm2_hook
===
--- lvm2_hook 2011-02-01 18:44:18 UTC (rev 108577)
+++ lvm2_hook 2011-02-01 18:56:47 UTC (rev 108578)
@@ -17,9 +17,7 @@
[ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
-msg "Scanning logical volumes..."
-eval /sbin/lvm vgscan --ignorelockingfailure $LVMQUIET
msg "Activating logical volumes..."
-eval /sbin/lvm vgchange --ignorelockingfailure --ignoremonitoring -ay
$LVMQUIET
+eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
fi
}
Modified: lvm2_install
===
--- lvm2_install2011-02-01 18:44:18 UTC (rev 108577)
+++ lvm2_install2011-02-01 18:56:47 UTC (rev 108578)
@@ -10,7 +10,6 @@
add_dir "/dev/mapper"
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"
[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hook lvm2_install)
Date: Monday, February 22, 2010 @ 13:05:13
Author: thomas
Revision: 69788
Add optional lvmwait= command line parameter, fixes FS#18428
Modified:
lvm2/trunk/PKGBUILD
lvm2/trunk/lvm2_hook
lvm2/trunk/lvm2_install
--+
PKGBUILD | 10 ++
lvm2_hook|8
lvm2_install |5 +
3 files changed, 19 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-02-22 18:04:56 UTC (rev 69787)
+++ PKGBUILD2010-02-22 18:05:13 UTC (rev 69788)
@@ -15,10 +15,12 @@
source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
lvm2_install
lvm2_hook)
-md5sums=('33e0e0f4b4582d495ff619696c634b2a' 'a85c48433b516bbf4e64e8953cf3ac5c'\
- '2915f3bf9d50964fdc94d7d7df2673d5')
-sha1sums=('7e5c7f28a476273fa2183f80f7c9db8783aab515'
'b102f047b48bd74915f2bac092901f9e5694ef3c'\
- '732cb5178f9feb54075794b39ae93d21ceea8498')
+md5sums=('33e0e0f4b4582d495ff619696c634b2a'
+ 'f781c9f5dd4f9934952c687b73d26a18'
+ '95bed25bdbc2c2d8500e7a07aeff7f65')
+sha1sums=('7e5c7f28a476273fa2183f80f7c9db8783aab515'
+ '583424bb0a6f89ffe4e4ea446b912f0fedac7050'
+ '0dc0c0d620f634c4d078afdb78e3bae15ccf957b')
build() {
cd "${srcdir}/LVM2.${_pkgverlvm}"
Modified: lvm2_hook
===
--- lvm2_hook 2010-02-22 18:04:56 UTC (rev 69787)
+++ lvm2_hook 2010-02-22 18:05:13 UTC (rev 69788)
@@ -7,6 +7,14 @@
/bin/mknod "/dev/mapper/control" c $(cat
/sys/class/misc/device-mapper/dev | sed 's|:| |')
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
+
[ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
msg "Scanning logical volumes..."
Modified: lvm2_install
===
--- lvm2_install2010-02-22 18:04:56 UTC (rev 69787)
+++ lvm2_install2010-02-22 18:05:13 UTC (rev 69788)
@@ -21,5 +21,10 @@
{
cat<
[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hook)
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
===
--- PKGBUILD2010-02-07 10:17:21 UTC (rev 67456)
+++ PKGBUILD2010-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
}
[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_hook lvm2_install)
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
===
--- PKGBUILD2010-02-05 22:22:41 UTC (rev 67243)
+++ PKGBUILD2010-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_install2010-02-05 22:22:41 UTC (rev 67243)
+++ lvm2_install2010-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 ()
