From 7db2e2097a2b724612f13d8762446ddd68484d1e Mon Sep 17 00:00:00 2001 From: Li xin Date: Tue, 7 Jul 2015 10:51:38 +0800 Subject: multipath-tools: bug fix Modify multipathd.service,otherwise it can't be started successfully. Signed-off-by: Li Xin Signed-off-by: Martin Jansa --- .../files/0001-multipathd.service-Error-fix.patch | 36 ++++++++++++++++++++++ .../multipath-tools/multipath-tools_git.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-multipathd.service-Error-fix.patch 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 0000000000..1e48e1c5fd --- /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 +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 +--- + 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 a3f20bcfb1..37b5fef6f6 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 # -- cgit 1.2.3-korg