Date: Wednesday, January 7, 2015 @ 01:40:24 Author: eric Revision: 228720
archrelease: copy trunk to core-i686 Added: lvm2/repos/core-i686/11-dm-initramfs.rules (from rev 228719, lvm2/trunk/11-dm-initramfs.rules) lvm2/repos/core-i686/PKGBUILD (from rev 228719, lvm2/trunk/PKGBUILD) lvm2/repos/core-i686/lvm2-make-sockets-static.patch (from rev 228719, lvm2/trunk/lvm2-make-sockets-static.patch) lvm2/repos/core-i686/lvm2.install (from rev 228719, lvm2/trunk/lvm2.install) lvm2/repos/core-i686/lvm2_hook (from rev 228719, lvm2/trunk/lvm2_hook) lvm2/repos/core-i686/lvm2_install (from rev 228719, lvm2/trunk/lvm2_install) lvm2/repos/core-i686/sd-lvm2_install (from rev 228719, lvm2/trunk/sd-lvm2_install) Deleted: lvm2/repos/core-i686/11-dm-initramfs.rules lvm2/repos/core-i686/PKGBUILD lvm2/repos/core-i686/lvm2-make-sockets-static.patch lvm2/repos/core-i686/lvm2.install lvm2/repos/core-i686/lvm2_hook lvm2/repos/core-i686/lvm2_install lvm2/repos/core-i686/sd-lvm2_install --------------------------------+ 11-dm-initramfs.rules | 6 - PKGBUILD | 201 +++++++++++++++++++-------------------- lvm2-make-sockets-static.patch | 40 +++---- lvm2.install | 50 ++++----- lvm2_hook | 24 ++-- lvm2_install | 68 ++++++------- sd-lvm2_install | 64 ++++++------ 7 files changed, 227 insertions(+), 226 deletions(-) Deleted: 11-dm-initramfs.rules =================================================================== --- 11-dm-initramfs.rules 2015-01-07 00:37:18 UTC (rev 228719) +++ 11-dm-initramfs.rules 2015-01-07 00:40:24 UTC (rev 228720) @@ -1,3 +0,0 @@ -# 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" Copied: lvm2/repos/core-i686/11-dm-initramfs.rules (from rev 228719, lvm2/trunk/11-dm-initramfs.rules) =================================================================== --- 11-dm-initramfs.rules (rev 0) +++ 11-dm-initramfs.rules 2015-01-07 00:40:24 UTC (rev 228720) @@ -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" Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-01-07 00:37:18 UTC (rev 228719) +++ PKGBUILD 2015-01-07 00:40:24 UTC (rev 228720) @@ -1,100 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> -# Maintainer: Thomas Bächler <tho...@archlinux.org> - -pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') -pkgver=2.02.114 -pkgrel=1 -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} - lvm2_install - lvm2_hook - sd-lvm2_install - 11-dm-initramfs.rules - lvm2-make-sockets-static.patch) -sha1sums=('ddd7cc93d6f879f5b8ad160c2755e94f58e5c003' - 'SKIP' - '40ef991650555b904e73bcc3f344d736722e27ca' - 'ff0fdf0a3005a41acd4b36865056109effc3474b' - '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' - 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') - -prepare() { - cd LVM2.${pkgver} - # enable lvmetad - sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in - # make systemd sockets static - patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch" -} - -build() { - CONFIGUREOPTS="--prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ - --with-udev-prefix=/usr --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --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 --with-thin=internal --with-cache=internal" - - cp -a LVM2.${pkgver} LVM2-initramfs - - cd LVM2.${pkgver} - - ./configure $CONFIGUREOPTS --enable-udev-systemd-background-jobs - make - - # Build legacy udev rule for initramfs - cd ../LVM2-initramfs - ./configure $CONFIGUREOPTS --enable-udev-systemd-background-jobs=no - cd udev - make 69-dm-lvm-metad.rules -} - -package_device-mapper() { - pkgdesc="Device mapper userspace library and tools" - url="http://sourceware.org/dm/" - depends=('glibc' 'systemd') - - cd LVM2.${pkgver} - make DESTDIR="${pkgdir}" install_device-mapper - # extra udev rule for device-mapper in initramfs - install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" - # Install dmeventd socket and service - make DESTDIR="${pkgdir}" install_systemd_units - rm -f "${pkgdir}/usr/lib/systemd/system/"{blk-availability.service,lvm2-*} - install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants" - ln -sf ../dm-event.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dm-event.socket" -} - -package_lvm2() { - 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') - options=('!makeflags') - install=lvm2.install - - cd LVM2.${pkgver} - make DESTDIR="${pkgdir}" install_lvm2 - # install applib - make -C liblvm DESTDIR="${pkgdir}" install - # /etc directories - install -d "${pkgdir}"/etc/lvm/{archive,backup} - # 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_install" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2" - # extra udev rule for lvmetad in non-systemd initramfs - install -D -m644 "${srcdir}/LVM2-initramfs/udev/69-dm-lvm-metad.rules" "${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm-metad.rules" - # systemd support - make DESTDIR="${pkgdir}" install_systemd_units - rm -f "${pkgdir}/usr/lib/systemd/system/"dm-* - install -d -m755 "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants" - ln -sf ../lvm2-lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket" - make DESTDIR="${pkgdir}" install_systemd_generators -} Copied: lvm2/repos/core-i686/PKGBUILD (from rev 228719, lvm2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-01-07 00:40:24 UTC (rev 228720) @@ -0,0 +1,101 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> +# Maintainer: Thomas Bächler <tho...@archlinux.org> + +pkgbase=lvm2 +pkgname=('lvm2' 'device-mapper') +pkgver=2.02.114 +pkgrel=1 +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} + lvm2_install + lvm2_hook + sd-lvm2_install + 11-dm-initramfs.rules + lvm2-make-sockets-static.patch) +sha1sums=('ddd7cc93d6f879f5b8ad160c2755e94f58e5c003' + 'SKIP' + '40ef991650555b904e73bcc3f344d736722e27ca' + 'ff0fdf0a3005a41acd4b36865056109effc3474b' + '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' + 'f6a554eea9557c3c236df2943bb6e7e723945c41' + 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') +validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') + +prepare() { + cd LVM2.${pkgver} + # enable lvmetad + sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in + # make systemd sockets static + patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch" +} + +build() { + CONFIGUREOPTS="--prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ + --with-udev-prefix=/usr --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --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 --with-thin=internal --with-cache=internal" + + cp -a LVM2.${pkgver} LVM2-initramfs + + cd LVM2.${pkgver} + + ./configure $CONFIGUREOPTS --enable-udev-systemd-background-jobs + make + + # Build legacy udev rule for initramfs + cd ../LVM2-initramfs + ./configure $CONFIGUREOPTS --enable-udev-systemd-background-jobs=no + cd udev + make 69-dm-lvm-metad.rules +} + +package_device-mapper() { + pkgdesc="Device mapper userspace library and tools" + url="http://sourceware.org/dm/" + depends=('glibc' 'systemd') + + cd LVM2.${pkgver} + make DESTDIR="${pkgdir}" install_device-mapper + # extra udev rule for device-mapper in initramfs + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" + # Install dmeventd socket and service + make DESTDIR="${pkgdir}" install_systemd_units + rm -f "${pkgdir}/usr/lib/systemd/system/"{blk-availability.service,lvm2-*} + install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants" + ln -sf ../dm-event.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dm-event.socket" +} + +package_lvm2() { + 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') + options=('!makeflags') + install=lvm2.install + + cd LVM2.${pkgver} + make DESTDIR="${pkgdir}" install_lvm2 + # install applib + make -C liblvm DESTDIR="${pkgdir}" install + # /etc directories + install -d "${pkgdir}"/etc/lvm/{archive,backup} + # 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_install" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2" + # extra udev rule for lvmetad in non-systemd initramfs + install -D -m644 "${srcdir}/LVM2-initramfs/udev/69-dm-lvm-metad.rules" "${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm-metad.rules" + # systemd support + make DESTDIR="${pkgdir}" install_systemd_units + rm -f "${pkgdir}/usr/lib/systemd/system/"dm-* + install -d -m755 "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants" + ln -sf ../lvm2-lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket" + make DESTDIR="${pkgdir}" install_systemd_generators +} Deleted: lvm2-make-sockets-static.patch =================================================================== --- lvm2-make-sockets-static.patch 2015-01-07 00:37:18 UTC (rev 228719) +++ lvm2-make-sockets-static.patch 2015-01-07 00:40:24 UTC (rev 228720) @@ -1,20 +0,0 @@ -diff -Nur LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in ---- LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in 2014-04-10 17:38:46.000000000 +0200 -+++ LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in 2014-04-26 14:21:10.097269315 +0200 -@@ -8,6 +8,3 @@ - ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-client - SocketMode=0600 - RemoveOnStop=true -- --[Install] --WantedBy=sockets.target -diff -Nur LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in ---- LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in 2014-04-10 17:38:46.000000000 +0200 -+++ LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in 2014-04-26 14:21:15.287156152 +0200 -@@ -7,6 +7,3 @@ - ListenStream=@DEFAULT_RUN_DIR@/lvmetad.socket - SocketMode=0600 - RemoveOnStop=true -- --[Install] --WantedBy=sysinit.target Copied: lvm2/repos/core-i686/lvm2-make-sockets-static.patch (from rev 228719, lvm2/trunk/lvm2-make-sockets-static.patch) =================================================================== --- lvm2-make-sockets-static.patch (rev 0) +++ lvm2-make-sockets-static.patch 2015-01-07 00:40:24 UTC (rev 228720) @@ -0,0 +1,20 @@ +diff -Nur LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in +--- LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in 2014-04-10 17:38:46.000000000 +0200 ++++ LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in 2014-04-26 14:21:10.097269315 +0200 +@@ -8,6 +8,3 @@ + ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-client + SocketMode=0600 + RemoveOnStop=true +- +-[Install] +-WantedBy=sockets.target +diff -Nur LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in +--- LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in 2014-04-10 17:38:46.000000000 +0200 ++++ LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in 2014-04-26 14:21:15.287156152 +0200 +@@ -7,6 +7,3 @@ + ListenStream=@DEFAULT_RUN_DIR@/lvmetad.socket + SocketMode=0600 + RemoveOnStop=true +- +-[Install] +-WantedBy=sysinit.target Deleted: lvm2.install =================================================================== --- lvm2.install 2015-01-07 00:37:18 UTC (rev 228719) +++ lvm2.install 2015-01-07 00:40:24 UTC (rev 228720) @@ -1,25 +0,0 @@ -post_upgrade() { - if [ $(vercmp $2 2.02.98-2) -lt 0 ]; then - echo "Changes to the lvm2 package:" - echo " + Activating lvm in mkinitcpio now requires both the 'udev' and 'lvm2' hooks." - echo " + LVM volumes are automatically activated by udev (full hotplug support)." - echo " + You MUST have use_lvmetad = 1 in /etc/lvm/lvm.conf (the default)." - echo " + If you uncomment auto_activation_volume_list in /etc/lvm/lvm.conf, only the" - echo " volumes listed there will be activated (default: it is commented out)." - if [ -f /etc/lvm/lvm.conf.pacnew ]; then - echo "WARNING: /etc/lvm/lvm.conf.pacnew exists. You MUST merge the required changes" - echo " into /etc/lvm/lvm.conf or LVM will fail to work." - fi - fi - - if [ $(vercmp $2 2.02.106-2) -lt 0 ]; then - if [ -L /etc/systemd/system/sysinit.target.wants/lvm-monitoring.service ]; then - echo "rm /etc/systemd/system/sysinit.target.wants/lvm-monitoring.service" - rm /etc/systemd/system/sysinit.target.wants/lvm-monitoring.service - echo "ln -s /usr/lib/systemd/system/lvm2-monitor.service /etc/systemd/system/sysinit.target.wants/lvm2-monitor.service" - ln -s /usr/lib/systemd/system/lvm2-monitor.service /etc/systemd/system/sysinit.target.wants/lvm2-monitor.service - fi - fi -} - -# vim:set ts=2 sw=2 et: Copied: lvm2/repos/core-i686/lvm2.install (from rev 228719, lvm2/trunk/lvm2.install) =================================================================== --- lvm2.install (rev 0) +++ lvm2.install 2015-01-07 00:40:24 UTC (rev 228720) @@ -0,0 +1,25 @@ +post_upgrade() { + if [ $(vercmp $2 2.02.98-2) -lt 0 ]; then + echo "Changes to the lvm2 package:" + echo " + Activating lvm in mkinitcpio now requires both the 'udev' and 'lvm2' hooks." + echo " + LVM volumes are automatically activated by udev (full hotplug support)." + echo " + You MUST have use_lvmetad = 1 in /etc/lvm/lvm.conf (the default)." + echo " + If you uncomment auto_activation_volume_list in /etc/lvm/lvm.conf, only the" + echo " volumes listed there will be activated (default: it is commented out)." + if [ -f /etc/lvm/lvm.conf.pacnew ]; then + echo "WARNING: /etc/lvm/lvm.conf.pacnew exists. You MUST merge the required changes" + echo " into /etc/lvm/lvm.conf or LVM will fail to work." + fi + fi + + if [ $(vercmp $2 2.02.106-2) -lt 0 ]; then + if [ -L /etc/systemd/system/sysinit.target.wants/lvm-monitoring.service ]; then + echo "rm /etc/systemd/system/sysinit.target.wants/lvm-monitoring.service" + rm /etc/systemd/system/sysinit.target.wants/lvm-monitoring.service + echo "ln -s /usr/lib/systemd/system/lvm2-monitor.service /etc/systemd/system/sysinit.target.wants/lvm2-monitor.service" + ln -s /usr/lib/systemd/system/lvm2-monitor.service /etc/systemd/system/sysinit.target.wants/lvm2-monitor.service + fi + fi +} + +# vim:set ts=2 sw=2 et: Deleted: lvm2_hook =================================================================== --- lvm2_hook 2015-01-07 00:37:18 UTC (rev 228719) +++ lvm2_hook 2015-01-07 00:40:24 UTC (rev 228720) @@ -1,12 +0,0 @@ -#!/usr/bin/ash - -run_earlyhook() { - mkdir /run/lvm - lvmetad -} - -run_cleanuphook() { - kill $(cat /run/lvmetad.pid) -} - -# vim: set ft=sh ts=4 sw=4 et: Copied: lvm2/repos/core-i686/lvm2_hook (from rev 228719, lvm2/trunk/lvm2_hook) =================================================================== --- lvm2_hook (rev 0) +++ lvm2_hook 2015-01-07 00:40:24 UTC (rev 228720) @@ -0,0 +1,12 @@ +#!/usr/bin/ash + +run_earlyhook() { + mkdir /run/lvm + lvmetad +} + +run_cleanuphook() { + kill $(cat /run/lvmetad.pid) +} + +# vim: set ft=sh ts=4 sw=4 et: Deleted: lvm2_install =================================================================== --- lvm2_install 2015-01-07 00:37:18 UTC (rev 228719) +++ lvm2_install 2015-01-07 00:40:24 UTC (rev 228720) @@ -1,34 +0,0 @@ -#!/usr/bin/bash - -build() { - local mod - for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-mq; do - add_module "$mod" - done - - add_binary "/usr/bin/lvm" - add_binary "/usr/bin/lvmetad" - add_binary "/usr/bin/dmsetup" - add_binary "/usr/bin/cache_check" - add_binary "/usr/bin/cache_dump" - add_binary "/usr/bin/cache_metadata_size" - add_binary "/usr/bin/cache_repair" - add_binary "/usr/bin/cache_restore" - 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/initcpio/udev/69-dm-lvm-metad.rules" "/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 <<HELPEOF -This hook enables LVM2 volumes in initramfs. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: Copied: lvm2/repos/core-i686/lvm2_install (from rev 228719, lvm2/trunk/lvm2_install) =================================================================== --- lvm2_install (rev 0) +++ lvm2_install 2015-01-07 00:40:24 UTC (rev 228720) @@ -0,0 +1,34 @@ +#!/usr/bin/bash + +build() { + local mod + for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-mq; do + add_module "$mod" + done + + add_binary "/usr/bin/lvm" + add_binary "/usr/bin/lvmetad" + add_binary "/usr/bin/dmsetup" + add_binary "/usr/bin/cache_check" + add_binary "/usr/bin/cache_dump" + add_binary "/usr/bin/cache_metadata_size" + add_binary "/usr/bin/cache_repair" + add_binary "/usr/bin/cache_restore" + 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/initcpio/udev/69-dm-lvm-metad.rules" "/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 <<HELPEOF +This hook enables LVM2 volumes in initramfs. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: Deleted: sd-lvm2_install =================================================================== --- sd-lvm2_install 2015-01-07 00:37:18 UTC (rev 228719) +++ sd-lvm2_install 2015-01-07 00:40:24 UTC (rev 228720) @@ -1,32 +0,0 @@ -#!/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/lvm2-lvmetad.service" - add_file "/usr/lib/systemd/system/lvm2-lvmetad.socket" - add_file "/usr/lib/systemd/system/lvm2-pvscan@.service" - add_symlink "/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket" -} - -help() { - cat <<HELPEOF -This hook enables LVM2 volumes in systemd-based initramfs. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: Copied: lvm2/repos/core-i686/sd-lvm2_install (from rev 228719, lvm2/trunk/sd-lvm2_install) =================================================================== --- sd-lvm2_install (rev 0) +++ sd-lvm2_install 2015-01-07 00:40:24 UTC (rev 228720) @@ -0,0 +1,32 @@ +#!/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/lvm2-lvmetad.service" + add_file "/usr/lib/systemd/system/lvm2-lvmetad.socket" + add_file "/usr/lib/systemd/system/lvm2-pvscan@.service" + add_symlink "/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket" +} + +help() { + cat <<HELPEOF +This hook enables LVM2 volumes in systemd-based initramfs. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: