aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-02-21 14:22:23 +0800
committerKhem Raj <raj.khem@gmail.com>2019-02-22 18:14:52 -0800
commit30255f72bc9177a41757d4aaba4f1544ec28ab1d (patch)
treec480bf2f5299ee49217ec4214e9cfbd4f47b0339
parent678320933c6818e8cc7a11f14301fea1f095a67e (diff)
downloadmeta-openembedded-contrib-30255f72bc9177a41757d4aaba4f1544ec28ab1d.tar.gz
meta-openembedded-contrib-30255f72bc9177a41757d4aaba4f1544ec28ab1d.tar.bz2
meta-openembedded-contrib-30255f72bc9177a41757d4aaba4f1544ec28ab1d.zip
lvm2: fix lvm2-monitor.service startup failed
Issue: vm2-monitor.service: Failed to create lvm2-monitor.service/start: Unit lvm2-lvmetad.socket not found lvmetad have been removed by upstream, but this part is missed, backport fix from upstream Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2/0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch31
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb4
2 files changed, 34 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch
new file mode 100644
index 0000000000..4eeac1c575
--- /dev/null
+++ b/meta-oe/recipes-support/lvm2/lvm2/0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch
@@ -0,0 +1,31 @@
+From b922f4a4e7e1c6c64a235bae4c575540bc4a12df Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 21 Feb 2019 14:00:34 +0800
+Subject: [PATCH] lvm2-monitoring service shouldn't refer to lvmetad
+
+Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;
+a=commit;h=df2fa88e631b13f0f2cfff4aeab80f12bd93ab72]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ scripts/lvm2_monitoring_systemd_red_hat.service.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
+index 2b87479..3282a95 100644
+--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
++++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
+@@ -1,8 +1,8 @@
+ [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=dm-event.socket lvm2-lvmetad.socket
+-After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service tmp.mount
++Requires=dm-event.socket
++After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount
+ Before=local-fs-pre.target
+ DefaultDependencies=no
+ Conflicts=shutdown.target
+--
+2.7.4
+
diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb
index b28acf1c4b..c38c381915 100644
--- a/meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb
+++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb
@@ -2,7 +2,9 @@ require lvm2.inc
SRCREV = "913c28917e62577a2ef67152b2e5159237503dda"
-SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch"
+SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch \
+ file://0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch \
+ "
DEPENDS += "autoconf-archive-native"