[arch-commits] Commit in lvm2/trunk (8 files)
Thomas Bächler
thomas at archlinux.org
Wed Oct 31 23:42:46 UTC 2012
Date: Wednesday, October 31, 2012 @ 19:42:46
Author: thomas
Revision: 170082
lvm2: start work on auto-activated (hotplugged) LVM volumes in systemd
Added:
lvm2/trunk/dmeventd.service
lvm2/trunk/dmeventd.socket
lvm2/trunk/lvm2_monitoring.service
lvm2/trunk/lvmetad.service
lvm2/trunk/lvmetad.socket
Modified:
lvm2/trunk/PKGBUILD
Deleted:
lvm2/trunk/lvm-on-crypt.service
lvm2/trunk/lvm.service
-------------------------+
PKGBUILD | 44 +++++++++++++++++++++++++++++++-------------
dmeventd.service | 12 ++++++++++++
dmeventd.socket | 11 +++++++++++
lvm-on-crypt.service | 16 ----------------
lvm.service | 16 ----------------
lvm2_monitoring.service | 18 ++++++++++++++++++
lvmetad.service | 14 ++++++++++++++
lvmetad.socket | 10 ++++++++++
8 files changed, 96 insertions(+), 45 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-10-31 22:52:16 UTC (rev 170081)
+++ PKGBUILD 2012-10-31 23:42:46 UTC (rev 170082)
@@ -5,7 +5,7 @@
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
pkgver=2.02.98
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://sourceware.org/lvm2/"
license=('GPL2' 'LGPL2.1')
@@ -14,27 +14,35 @@
lvm2_install
lvm2_hook
11-dm-initramfs.rules
- lvm.service
- lvm-on-crypt.service
- lvm2.conf)
+ lvm2.conf
+ dmeventd.service
+ dmeventd.socket
+ lvm2_monitoring.service
+ lvmetad.service
+ lvmetad.socket)
sha1sums=('077425115b164c335a9930df745943e9ea666a8a'
'4713c852fc668e6fbd36ff7c6b5675b10a95a0f8'
'3e1680f9b76ce9150d08865d99db90fd15532271'
'cedc9948123c870f9c5aa3357d0075b41a9c8135'
'f6a554eea9557c3c236df2943bb6e7e723945c41'
- 'edce6b6e8d03f7cbad4bfff49fab01d618415be8'
- '652fb58dd7676caa0515f0a06d537744e071c6cf'
- 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4')
+ 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
+ '8bc78727dc3a15243eec72032688b5b65689bc5b'
+ '1d56f47a81350ae37ffbf61ee036fe31f4c5d504'
+ '2fa406422a99cc3adcdfe6d59f4836fd0e55b17f'
+ 'd795ad9436f3504c638d0405c233bb8ad465527b'
+ '370f497c28754169e427c8419bceb73f1cf64757')
build() {
cd "${srcdir}/LVM2.${pkgver}"
unset LDFLAGS
./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
- --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \
- --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \
- --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules \
- --with-default-locking-dir=/run/lock/lvm
+ --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --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
make
}
@@ -47,6 +55,11 @@
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
+ install -D -m644 "${srcdir}/dmeventd.service" "${pkgdir}/usr/lib/systemd/system/dmeventd.service"
+ install -D -m644 "${srcdir}/dmeventd.socket" "${pkgdir}/usr/lib/systemd/system/dmeventd.socket"
+ install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
+ ln -sf /usr/lib/systemd/system/dmeventd.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dmeventd.socket"
}
package_lvm2() {
@@ -66,7 +79,12 @@
install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
# systemd support
- install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service"
- install -D -m644 "${srcdir}/lvm-on-crypt.service" "${pkgdir}/usr/lib/systemd/system/lvm-on-crypt.service"
install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf"
+ install -D -m644 "${srcdir}/lvm2_monitoring.service" "${pkgdir}/usr/lib/systemd/system/lvm2_monitoring.service"
+ install -D -m644 "${srcdir}/lvmetad.service" "${pkgdir}/usr/lib/systemd/system/lvmetad.service"
+ install -D -m644 "${srcdir}/lvmetad.socket" "${pkgdir}/usr/lib/systemd/system/lvmetad.socket"
+ install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
+ ln -sf /usr/lib/systemd/system/lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/lvmetad.socket"
+ # enable lvmetad
+ sed 's|use_lvmetad = 0|use_lvmetad = 1|' -i "${pkgdir}/etc/lvm/lvm.conf"
}
Added: dmeventd.service
===================================================================
--- dmeventd.service (rev 0)
+++ dmeventd.service 2012-10-31 23:42:46 UTC (rev 170082)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Device-mapper event daemon
+Documentation=man:dmeventd(8)
+DefaultDependencies=no
+
+[Service]
+Type=forking
+ExecStart=/sbin/dmeventd
+ExecReload=/sbin/dmeventd -R
+Environment=SD_ACTIVATION=1
+PIDFile=/run/dmeventd.pid
+OOMScoreAdjust=-1000
Added: dmeventd.socket
===================================================================
--- dmeventd.socket (rev 0)
+++ dmeventd.socket 2012-10-31 23:42:46 UTC (rev 170082)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Device-mapper event daemon FIFOs
+Documentation=man:dmeventd(8)
+Before=sockets.target
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+[Socket]
+ListenFIFO=/run/dmeventd-server
+ListenFIFO=/run/dmeventd-client
+SocketMode=0600
Deleted: lvm-on-crypt.service
===================================================================
--- lvm-on-crypt.service 2012-10-31 22:52:16 UTC (rev 170081)
+++ lvm-on-crypt.service 2012-10-31 23:42:46 UTC (rev 170082)
@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM activation of encrypted devices
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service cryptsetup.target
-Before=shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/vgchange --available y
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target
Deleted: lvm.service
===================================================================
--- lvm.service 2012-10-31 22:52:16 UTC (rev 170081)
+++ lvm.service 2012-10-31 23:42:46 UTC (rev 170082)
@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM activation
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service
-Before=basic.target shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/vgchange --available y
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target
Added: lvm2_monitoring.service
===================================================================
--- lvm2_monitoring.service (rev 0)
+++ lvm2_monitoring.service 2012-10-31 23:42:46 UTC (rev 170082)
@@ -0,0 +1,18 @@
+[Unit]
+Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
+Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
+Requires=dmeventd.socket
+After=dmeventd.socket lvmetad.socket lvmetad.service dmeventd.service
+Before=local-fs-pre.target
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
+ExecStart=/sbin/lvm vgchange --monitor y
+ExecStop=/sbin/lvm vgchange --monitor n
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
\ No newline at end of file
Added: lvmetad.service
===================================================================
--- lvmetad.service (rev 0)
+++ lvmetad.service 2012-10-31 23:42:46 UTC (rev 170082)
@@ -0,0 +1,14 @@
+[Unit]
+Description=LVM2 metadata daemon
+Documentation=man:lvmetad(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+[Service]
+Type=forking
+NonBlocking=true
+ExecStart=/sbin/lvmetad
+ExecReload=/sbin/lvmetad -R
+Environment=SD_ACTIVATION=1
+Restart=on-abort
+PIDFile=/run/lvmetad.pid
Added: lvmetad.socket
===================================================================
--- lvmetad.socket (rev 0)
+++ lvmetad.socket 2012-10-31 23:42:46 UTC (rev 170082)
@@ -0,0 +1,10 @@
+[Unit]
+Description=LVM2 metadata daemon socket
+Documentation=man:lvmetad(8)
+Before=sockets.target
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+[Socket]
+ListenStream=/run/lvm/lvmetad.socket
+SocketMode=0600
More information about the arch-commits
mailing list