[oe-commits] Li xin : multipath-tools: bug fix

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 11b8925fc416a1f4cd2e5ff8d6bfbd2b0355ef30
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=11b8925fc416a1f4cd2e5ff8d6bfbd2b0355ef30

Author: Li xin <lixin.fnst at cn.fujitsu.com>
Date:   Tue Jul  7 10:51:38 2015 +0800

multipath-tools: bug fix

Modify multipathd.service,otherwise it can't be started successfully.

Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../files/0001-multipathd.service-Error-fix.patch  | 36 ++++++++++++++++++++++
 .../multipath-tools/multipath-tools_git.bb         |  1 +
 2 files changed, 37 insertions(+)

diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-multipathd.service-Error-fix.patch b/meta-oe/recipes-support/multipath-tools/files/0001-multipathd.service-Error-fix.patch
new file mode 100644
index 0000000..1e48e1c
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-multipathd.service-Error-fix.patch
@@ -0,0 +1,36 @@
+From 74ff5e1cf8ef83dabcf6e6b92f87d6761f7f4d51 Mon Sep 17 00:00:00 2001
+From: Li xin <lixin.fnst at cn.fujitsu.com>
+Date: Tue, 7 Jul 2015 11:34:36 +0900
+Subject: [PATCH] multipathd.service: Error fix
+
+Failed to start Device-Mapper Multipath Device Controller.
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
+---
+ multipathd/multipathd.service | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
+index be3ba3f..b8d3ecd 100644
+--- a/multipathd/multipathd.service
++++ b/multipathd/multipathd.service
+@@ -6,11 +6,12 @@ DefaultDependencies=no
+ Conflicts=shutdown.target
+ 
+ [Service]
+-Type=notify
++Type=forking
+ NotifyAccess=main
+ LimitCORE=infinity
++PIDFile=/var/run/multipathd.pid
+ ExecStartPre=/sbin/modprobe dm-multipath
+-ExecStart=/sbin/multipathd -d -s
++ExecStart=/sbin/multipathd
+ ExecReload=/sbin/multipathd reconfigure
+ 
+ [Install]
+-- 
+1.8.4.2
+
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb
index f35cc3b..bb4e15c 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb
@@ -10,6 +10,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \
            file://always-use-libdevmapper.patch \
            file://always-use-libdevmapper-kpartx.patch \
            file://do-not-link-libmpathpersist-to-TMPDIR.patch \
+           file://0001-multipathd.service-Error-fix.patch \
            "
 # 0.5.0
 #