[arch-commits] Commit in lvm2/repos/testing-x86_64 (12 files)
Christian Hesse
eworm at archlinux.org
Mon Jan 29 13:53:19 UTC 2018
Date: Monday, January 29, 2018 @ 13:53:18
Author: eworm
Revision: 315564
archrelease: copy trunk to testing-x86_64
Added:
lvm2/repos/testing-x86_64/11-dm-initramfs.rules
(from rev 315563, lvm2/trunk/11-dm-initramfs.rules)
lvm2/repos/testing-x86_64/PKGBUILD
(from rev 315563, lvm2/trunk/PKGBUILD)
lvm2/repos/testing-x86_64/lvm2.install
(from rev 315563, lvm2/trunk/lvm2.install)
lvm2/repos/testing-x86_64/lvm2_hook
(from rev 315563, lvm2/trunk/lvm2_hook)
lvm2/repos/testing-x86_64/lvm2_install
(from rev 315563, lvm2/trunk/lvm2_install)
lvm2/repos/testing-x86_64/sd-lvm2_install
(from rev 315563, lvm2/trunk/sd-lvm2_install)
Deleted:
lvm2/repos/testing-x86_64/11-dm-initramfs.rules
lvm2/repos/testing-x86_64/PKGBUILD
lvm2/repos/testing-x86_64/lvm2.install
lvm2/repos/testing-x86_64/lvm2_hook
lvm2/repos/testing-x86_64/lvm2_install
lvm2/repos/testing-x86_64/sd-lvm2_install
-----------------------+
11-dm-initramfs.rules | 6 -
PKGBUILD | 248 ++++++++++++++++++++++++------------------------
lvm2.install | 50 ++++-----
lvm2_hook | 50 ++++-----
lvm2_install | 89 +++++++++--------
sd-lvm2_install | 90 ++++++++---------
6 files changed, 271 insertions(+), 262 deletions(-)
Deleted: 11-dm-initramfs.rules
===================================================================
--- 11-dm-initramfs.rules 2018-01-29 13:47:08 UTC (rev 315563)
+++ 11-dm-initramfs.rules 2018-01-29 13:53:18 UTC (rev 315564)
@@ -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/testing-x86_64/11-dm-initramfs.rules (from rev 315563, lvm2/trunk/11-dm-initramfs.rules)
===================================================================
--- 11-dm-initramfs.rules (rev 0)
+++ 11-dm-initramfs.rules 2018-01-29 13:53:18 UTC (rev 315564)
@@ -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 2018-01-29 13:47:08 UTC (rev 315563)
+++ PKGBUILD 2018-01-29 13:53:18 UTC (rev 315564)
@@ -1,124 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgbase=lvm2
-pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.177
-pkgrel=2
-arch=('x86_64')
-url="http://sourceware.org/lvm2/"
-license=('GPL2' 'LGPL2.1')
-makedepends=('systemd' 'thin-provisioning-tools')
-groups=('base')
-validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') # Alasdair G Kergon <agk at redhat.com>
-source=(https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${pkgver}.tgz{,.asc}
- lvm2_install
- lvm2_hook
- sd-lvm2_install
- 11-dm-initramfs.rules)
-sha256sums=('4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2'
- 'SKIP'
- 'd3097296bdfd9912dbef6ac78b908f7017b0a668a5347f0811f1c3aaacdca0cf'
- '97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80'
- 'ca25d7d827823ed88c5ed662d561ad9de0123ca6e8e5b568fe9eec3c89918614'
- 'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
-
-prepare() {
- cd LVM2.${pkgver}
-
- # enable lvmetad
- sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in
-
- # remove install section from systemd units that are enabled by default
- sed -i -e '/^\[Install\]$/,$d' \
- scripts/lvm2_lvmetad_systemd_red_hat.socket.in \
- scripts/lvm2_lvmpolld_systemd_red_hat.socket.in \
- scripts/lvm2_monitoring_systemd_red_hat.service.in
-}
-
-build() {
- local CONFIGUREOPTS=(
- --prefix=/usr
- --sbindir=/usr/bin
- --sysconfdir=/etc
- --localstatedir=/var
- --enable-applib
- --enable-cmdlib
- --enable-dmeventd
- --enable-lvmetad
- --enable-lvmpolld
- --enable-pkgconfig
- --enable-readline
- --enable-udev_rules
- --enable-udev_sync
- --with-cache=internal
- --with-default-dm-run-dir=/run
- --with-default-locking-dir=/run/lock/lvm
- --with-default-pid-dir=/run
- --with-default-run-dir=/run/lvm
- --with-systemdsystemunitdir=/usr/lib/systemd/system
- --with-thin=internal
- --with-udev-prefix=/usr
- )
-
- 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' 'libsystemd')
-
- 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}" 'libsystemd' 'readline' 'thin-provisioning-tools')
- conflicts=('lvm' 'mkinitcpio<0.7')
- backup=('etc/lvm/lvm.conf'
- 'etc/lvm/lvmlocal.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"
- ln -sf ../lvm2-lvmpolld.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmpolld.socket"
- ln -sf ../lvm2-monitor.service "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-monitor.service"
- make DESTDIR="${pkgdir}" install_systemd_generators
-}
Copied: lvm2/repos/testing-x86_64/PKGBUILD (from rev 315563, lvm2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-29 13:53:18 UTC (rev 315564)
@@ -0,0 +1,124 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgbase=lvm2
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.02.177
+pkgrel=3
+arch=('x86_64')
+url="http://sourceware.org/lvm2/"
+license=('GPL2' 'LGPL2.1')
+makedepends=('systemd' 'thin-provisioning-tools')
+groups=('base')
+validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') # Alasdair G Kergon <agk at redhat.com>
+source=("https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${pkgver}.tgz"{,.asc}
+ 'lvm2_install'
+ 'lvm2_hook'
+ 'sd-lvm2_install'
+ '11-dm-initramfs.rules')
+sha256sums=('4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2'
+ 'SKIP'
+ '5129f87a8b30d5a8621e9c1c0664910a588bdd77bff09473afb73efb41305cbb'
+ '97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80'
+ 'b9f5fda718ccf30d964b26b9025f4814dd35a821da8648e204e8640d6ae89c42'
+ 'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
+
+prepare() {
+ cd LVM2.${pkgver}
+
+ # enable lvmetad
+ sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in
+
+ # remove install section from systemd units that are enabled by default
+ sed -i -e '/^\[Install\]$/,$d' \
+ scripts/lvm2_lvmetad_systemd_red_hat.socket.in \
+ scripts/lvm2_lvmpolld_systemd_red_hat.socket.in \
+ scripts/lvm2_monitoring_systemd_red_hat.service.in
+}
+
+build() {
+ local CONFIGUREOPTS=(
+ --prefix=/usr
+ --sbindir=/usr/bin
+ --sysconfdir=/etc
+ --localstatedir=/var
+ --enable-applib
+ --enable-cmdlib
+ --enable-dmeventd
+ --enable-lvmetad
+ --enable-lvmpolld
+ --enable-pkgconfig
+ --enable-readline
+ --enable-udev_rules
+ --enable-udev_sync
+ --with-cache=internal
+ --with-default-dm-run-dir=/run
+ --with-default-locking-dir=/run/lock/lvm
+ --with-default-pid-dir=/run
+ --with-default-run-dir=/run/lvm
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
+ --with-thin=internal
+ --with-udev-prefix=/usr
+ )
+
+ 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' 'libsystemd')
+
+ 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}" 'libsystemd' 'readline' 'thin-provisioning-tools')
+ conflicts=('lvm' 'mkinitcpio<0.7')
+ backup=('etc/lvm/lvm.conf'
+ 'etc/lvm/lvmlocal.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"
+ ln -sf ../lvm2-lvmpolld.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmpolld.socket"
+ ln -sf ../lvm2-monitor.service "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-monitor.service"
+ make DESTDIR="${pkgdir}" install_systemd_generators
+}
Deleted: lvm2.install
===================================================================
--- lvm2.install 2018-01-29 13:47:08 UTC (rev 315563)
+++ lvm2.install 2018-01-29 13:53:18 UTC (rev 315564)
@@ -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/testing-x86_64/lvm2.install (from rev 315563, lvm2/trunk/lvm2.install)
===================================================================
--- lvm2.install (rev 0)
+++ lvm2.install 2018-01-29 13:53:18 UTC (rev 315564)
@@ -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 2018-01-29 13:47:08 UTC (rev 315563)
+++ lvm2_hook 2018-01-29 13:53:18 UTC (rev 315564)
@@ -1,25 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
- mkdir /run/lvm
- 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)
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: lvm2/repos/testing-x86_64/lvm2_hook (from rev 315563, lvm2/trunk/lvm2_hook)
===================================================================
--- lvm2_hook (rev 0)
+++ lvm2_hook 2018-01-29 13:53:18 UTC (rev 315564)
@@ -0,0 +1,25 @@
+#!/usr/bin/ash
+
+run_earlyhook() {
+ mkdir /run/lvm
+ 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)
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: lvm2_install
===================================================================
--- lvm2_install 2018-01-29 13:47:08 UTC (rev 315563)
+++ lvm2_install 2018-01-29 13:53:18 UTC (rev 315564)
@@ -1,41 +0,0 @@
-#!/usr/bin/bash
-
-build() {
- local mod
- local symlink
-
- for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-smq dm-thin-pool; do
- add_module "$mod"
- done
-
- # from lvm2
- add_binary "/usr/bin/lvm"
- add_binary "/usr/bin/lvmetad"
-
- # from device-mapper
- add_binary "/usr/bin/dmsetup"
-
- # from thin-provisioning-tools
- add_binary "/usr/bin/pdata_tools"
- for symlink in cache_{check,dump,metadata_size,repair,restore} thin_{check,delta,dump,ls,metadata_size,repair,restore,rmap,trim}; do
- add_symlink "/usr/bin/${symlink}" "pdata_tools"
- done
-
- 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/testing-x86_64/lvm2_install (from rev 315563, lvm2/trunk/lvm2_install)
===================================================================
--- lvm2_install (rev 0)
+++ lvm2_install 2018-01-29 13:53:18 UTC (rev 315564)
@@ -0,0 +1,48 @@
+#!/usr/bin/bash
+
+build() {
+ local mod
+ local symlink
+
+ # device mapper modules
+ for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-smq dm-thin-pool; do
+ add_module "$mod"
+ done
+
+ # binaries from lvm2
+ add_binary "/usr/bin/lvm"
+ add_binary "/usr/bin/lvmetad"
+
+ # beinaries from device-mapper
+ add_binary "/usr/bin/dmsetup"
+ add_binary "/usr/bin/dmeventd"
+
+ # these are dlopen()ed
+ for library in libdevmapper-event-lvm2{mirror,raid,snapshot,thin}; do
+ add_binary "/usr/lib/${library}.so"
+ done
+
+ # from thin-provisioning-tools
+ add_binary "/usr/bin/pdata_tools"
+ for symlink in cache_{check,dump,metadata_size,repair,restore} thin_{check,delta,dump,ls,metadata_size,repair,restore,rmap,trim}; do
+ add_symlink "/usr/bin/${symlink}" "pdata_tools"
+ done
+
+ 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 2018-01-29 13:47:08 UTC (rev 315563)
+++ sd-lvm2_install 2018-01-29 13:53:18 UTC (rev 315564)
@@ -1,44 +0,0 @@
-#!/usr/bin/bash
-
-build() {
- local mod
- local symlink
-
- for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-smq dm-thin-pool; do
- add_module "$mod"
- done
-
- # from lvm2
- add_binary "/usr/bin/lvm"
- add_binary "/usr/bin/lvmetad"
-
- # from device-mapper
- add_binary "/usr/bin/dmsetup"
-
- # from thin-provisioning-tools
- add_binary "/usr/bin/pdata_tools"
- for symlink in cache_{check,dump,metadata_size,repair,restore} thin_{check,delta,dump,ls,metadata_size,repair,restore,rmap,trim}; do
- add_symlink "/usr/bin/${symlink}" "pdata_tools"
- done
-
- 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 at .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/testing-x86_64/sd-lvm2_install (from rev 315563, lvm2/trunk/sd-lvm2_install)
===================================================================
--- sd-lvm2_install (rev 0)
+++ sd-lvm2_install 2018-01-29 13:53:18 UTC (rev 315564)
@@ -0,0 +1,46 @@
+#!/usr/bin/bash
+
+build() {
+ local mod
+ local symlink
+
+ # device mapper modules
+ for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-smq dm-thin-pool; do
+ add_module "$mod"
+ done
+
+ # device mapper and lvm2 systemd units
+ # binaries and libraries are pull automatically, except ...
+ add_systemd_unit "dm-event.service"
+ add_systemd_unit "lvm2-lvmetad.service"
+ add_systemd_unit "lvm2-pvscan at .service"
+ add_symlink "/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket"
+
+ # ... these, which are dlopen()ed
+ for library in libdevmapper-event-lvm2{mirror,raid,snapshot,thin}; do
+ add_binary "/usr/lib/${library}.so"
+ done
+
+ # from thin-provisioning-tools
+ add_binary "/usr/bin/pdata_tools"
+ for symlink in cache_{check,dump,metadata_size,repair,restore} thin_{check,delta,dump,ls,metadata_size,repair,restore,rmap,trim}; do
+ add_symlink "/usr/bin/${symlink}" "pdata_tools"
+ done
+
+ # udev rules and lvm configuration
+ 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"
+}
+
+help() {
+ cat <<HELPEOF
+This hook enables LVM2 volumes in systemd-based initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
More information about the arch-commits
mailing list