Fri Jul 1 23:11:14 UTC 2011

5 files changed, 145 insertions, 0 deletions

diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules
new file mode 100644
index 000000000..d2c167324
--- /dev/null
+++ b/testing/lvm2/11-dm-initramfs.rules
@@ -0,0 +1,3 @@
+# 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"
diff --git a/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff
new file mode 100644
index 000000000..e75499e8e
--- /dev/null
+++ b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff
@@ -0,0 +1,17 @@
+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;
diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD
new file mode 100644
index 000000000..0e13adba9
--- /dev/null
+++ b/testing/lvm2/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 129975 2011-06-30 17:54:05Z thomas $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgbase=lvm2
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.02.85
+_pkgverlvm=${pkgver}
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://sourceware.org/lvm2/"
+license=('GPL2' 'LGPL2.1')
+groups=('base')
+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'
+         'dcb82506d732cc7b10159a89b579dba8'
+         '8d613b84a175cd85f752a75198e40e15'
+         '6db89da27928d2415a8e26cd0a842712'
+         '69e40679cd8b3658bfc619e48baae125')
+sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7'
+          '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
+          'a0e0513c2efb183006e57e595d93ce18be297928'
+          '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 \
+    --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
+    --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules
+  make
+}
+
+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() {
+  pkgdesc="Logical Volume Manager 2 utilities"
+  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
+  conflicts=('lvm' 'mkinitcpio<0.7')
+  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"
+}
diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook
new file mode 100644
index 000000000..874b91d06
--- /dev/null
+++ b/testing/lvm2/lvm2_hook
@@ -0,0 +1,25 @@
+# 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
+            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
+        # 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 "Activating logical volumes..."
+        [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit
+        eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
+    fi
+}
diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install
new file mode 100644
index 000000000..94175b523
--- /dev/null
+++ b/testing/lvm2/lvm2_install
@@ -0,0 +1,29 @@
+# vim: set ft=sh:
+
+build()
+{
+    MODULES=" dm-mod dm-snapshot dm-mirror"
+    BINARIES=""
+    FILES=""
+    SCRIPT="lvm2"
+
+    add_binary "/sbin/lvm"
+    add_binary "/sbin/dmsetup"
+    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"
+    add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook loads the necessary modules for an LVM2 root device.
+
+  The optional lvmwait= parameter followed by a comma-separated
+  list of device names can be given on the command line.
+  It will cause the hook to wait until all given devices exist
+  before trying to scan and activate any volume groups.
+HELPEOF
+}