From 1e19fc4d9caacba9aeb82a04a293d8de65b5c3c9 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Sun, 7 Jun 2020 21:20:08 +0800 Subject: lvm2: remove service template from SYSTEMD_SERVICE Remove systemd service template lvm2-pvscan@.service from SYSTEMD_SERVICE. It should be started/stopped in udev rules file 69-dm-lvm-metad.rules. Signed-off-by: Kai Kang Signed-off-by: Khem Raj (cherry picked from commit d85613d8d1d285c9a1f9cf3cf8b13655220cd8cf) Signed-off-by: Armin Kuster --- meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb index e2b551bbc6..bc86810ecb 100644 --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb @@ -32,7 +32,7 @@ PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ - blk-availability.service lvm2-pvscan@.service" + blk-availability.service" SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" @@ -52,7 +52,11 @@ FILES_libdevmapper = " \ ${sbindir}/dmstats \ " -FILES_${PN} += "${libdir}/device-mapper/*.so" +FILES_${PN} += " \ + ${libdir}/device-mapper/*.so \ + ${systemd_system_unitdir}/lvm2-pvscan@.service \ +" + FILES_${PN}-scripts = " \ ${sbindir}/blkdeactivate \ ${sbindir}/fsadm \ -- cgit 1.2.3-korg