[arch-commits] Commit in lvm2/trunk (PKGBUILD sd-lvm2)

[Thomas Bächler]

    Date: Saturday, September 28, 2013 @ 23:30:00
  Author: thomas
Revision: 195239

upgpkg: lvm2 2.02.102-1 - add thin provisioning support and sd-lvm2 mkinitcpio hook.

Added:
  lvm2/trunk/sd-lvm2
Modified:
  lvm2/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++----
 sd-lvm2  |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-28 21:28:47 UTC (rev 195238)
+++ PKGBUILD	2013-09-28 21:30:00 UTC (rev 195239)
@@ -4,16 +4,17 @@
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.100
+pkgver=2.02.102
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
-makedepends=('systemd')
+makedepends=('systemd' 'thin-provisioning-tools')
 groups=('base')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvm2_install
         lvm2_hook
+        sd-lvm2
         11-dm-initramfs.rules
         lvm2.conf
         dmeventd.service
@@ -21,10 +22,11 @@
         lvm-monitoring.service
         lvmetad.service
         lvmetad.socket)
-sha1sums=('95a4478e4a19bba2c6eb8c36b08b310a96e3944b'
+sha1sums=('814ff785c447373dc5bad6352088eb7aaccf29ac'
           'SKIP'
           '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
+          '30777d42e31cb7fe1f4fadc1e8f4c4d4cdd8ffed'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
           'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
           '01782ce8e10718c1513e3906b126f30f682f5cab'
@@ -48,7 +50,7 @@
     --with-default-pid-dir=/run --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \
     --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
     --enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \
-    --enable-lvmetad
+    --enable-lvmetad --with-thin=internal
   make
 }
 
@@ -74,6 +76,7 @@
   conflicts=('lvm' 'mkinitcpio<0.7')
   backup=('etc/lvm/lvm.conf')
   options=('!makeflags')
+  optdepends=('thin-provisioning-tools: For thin provisioning support.')
   install=lvm2.install
 
   cd LVM2.${pkgver}
@@ -85,6 +88,7 @@
   # mkinitcpio hook
   install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
   install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
+  install -D -m644 "${srcdir}/sd-lvm2" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
   # systemd support
   install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf"
   install -D -m644 "${srcdir}/lvm-monitoring.service" "${pkgdir}/usr/lib/systemd/system/lvm-monitoring.service"

Added: sd-lvm2
===================================================================
--- sd-lvm2	                        (rev 0)
+++ sd-lvm2	2013-09-28 21:30:00 UTC (rev 195239)
@@ -0,0 +1,31 @@
+#!/usr/bin/bash
+
+build() {
+    local mod
+    for mod in dm-mod dm-snapshot dm-mirror; do
+        add_module "$mod"
+    done
+
+    add_binary "/usr/bin/lvm"
+    add_binary "/usr/bin/lvmetad"
+    add_binary "/usr/bin/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_file "/usr/lib/systemd/system/lvmetad.service"
+    add_file "/usr/lib/systemd/system/lvmetad.socket"
+    add_symlink "/usr/lib/systemd/system/sockets.target.wants/lvmetad.socket"
+}
+
+help() {
+  cat <<HELPEOF
+This hook enables LVM2 volumes in systemd-based initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et: