Date: Monday, January 29, 2018 @ 13:04:51 Author: eworm Revision: 315561
upgpkg: lvm2 2.02.177-2 remove install section from systemd units that are enabled by default (FS#57225) Modified: lvm2/trunk/PKGBUILD Deleted: lvm2/trunk/0001-lvm2-make-sockets-static.patch -------------------------------------+ 0001-lvm2-make-sockets-static.patch | 20 -------------------- PKGBUILD | 15 ++++++++------- 2 files changed, 8 insertions(+), 27 deletions(-) Deleted: 0001-lvm2-make-sockets-static.patch =================================================================== --- 0001-lvm2-make-sockets-static.patch 2018-01-29 11:51:13 UTC (rev 315560) +++ 0001-lvm2-make-sockets-static.patch 2018-01-29 13:04:51 UTC (rev 315561) @@ -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 Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-29 11:51:13 UTC (rev 315560) +++ PKGBUILD 2018-01-29 13:04:51 UTC (rev 315561) @@ -5,7 +5,7 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.177 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -16,15 +16,13 @@ lvm2_install lvm2_hook sd-lvm2_install - 11-dm-initramfs.rules - 0001-lvm2-make-sockets-static.patch) + 11-dm-initramfs.rules) sha256sums=('4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2' 'SKIP' 'd3097296bdfd9912dbef6ac78b908f7017b0a668a5347f0811f1c3aaacdca0cf' '97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80' 'ca25d7d827823ed88c5ed662d561ad9de0123ca6e8e5b568fe9eec3c89918614' - 'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0' - 'ff2c21d8f1c01c5e889a61109a152dcbd15da017bb942cf598c82e2e18ad22fa') + 'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0') prepare() { cd LVM2.${pkgver} @@ -32,8 +30,11 @@ # enable lvmetad sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in - # make systemd sockets static - patch -p1 -i "${srcdir}/0001-lvm2-make-sockets-static.patch" + # 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() {