pool/dracut
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 230295 from home:hreinecke:branches:Base:System

Browse Source 
- Enable multipath correctly during booting (bnc#873686)
  Add: 0022-90multipath-Fixup-service-file-for-booting.patch

OBS-URL: https://build.opensuse.org/request/show/230295
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=134
This commit is contained in:
Thomas Renninger 2014-04-16 08:48:33 +00:00 committed by Git OBS Bridge
parent 9e84022b95
commit b9777a0800
3 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
0022-90multipath-Fixup-service-file-for-booting.patch Normal file
View File

@ -0,0 +1,51 @@
From 10eda256afc1f1de0bffa26afdbdcf04394aeeeb Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Wed, 16 Apr 2014 09:35:28 +0200
Subject: 90multipath: Fixup service file for booting
'Type=forking' caused systemd to immediately terminate the
entire process, and not creating any device maps.
So we should be using 'Type=simple' here.
References: bnc#873686
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
modules.d/90multipath/module-setup.sh | 4 ++--
modules.d/90multipath/multipathd.service | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
index 508241e..0149df9 100755
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -92,8 +92,8 @@ install() {
if dracut_module_included "systemd"; then
inst_simple "${moddir}/multipathd.service" "${systemdsystemunitdir}/multipathd.service"
- mkdir -p "${initdir}${systemdsystemconfdir}/sysinit.target.wants"
- ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service" "${initdir}${systemdsystemconfdir}/sysinit.target.wants/multipathd.service"
+ mkdir -p "${initdir}${systemdsystemunitdir}/sysinit.target.wants"
+ ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service" "${initdir}${systemdsystemunitdir}/sysinit.target.wants/multipathd.service"
else
inst_hook pre-trigger 02 "$moddir/multipathd.sh"
inst_hook cleanup 02 "$moddir/multipathd-stop.sh"
diff --git a/modules.d/90multipath/multipathd.service b/modules.d/90multipath/multipathd.service
index 01e497c..50a0883 100644
--- a/modules.d/90multipath/multipathd.service
+++ b/modules.d/90multipath/multipathd.service
@@ -5,9 +5,9 @@ DefaultDependencies=no
Conflicts=shutdown.target
[Service]
-Type=forking
+Type=simple
ExecStartPre=/sbin/modprobe dm-multipath
-ExecStart=/sbin/multipathd
+ExecStart=/sbin/multipathd -s -d
ExecReload=/sbin/multipathd reconfigure
ExecStop=/sbin/multipathd shutdown
--
1.8.1.4

6
dracut.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Apr 16 09:56:31 CEST 2014 - hare@suse.de
- Enable multipath correctly during booting (bnc#873686)
Add: 0022-90multipath-Fixup-service-file-for-booting.patch
-------------------------------------------------------------------
Mon Apr 14 14:19:49 UTC 2014 - pwieczorkiewicz@suse.com

2
dracut.spec
View File

@ -58,6 +58,7 @@ Patch31: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch
Patch32: 0020-95udev-rules-Include-correct-sg3_utils-rules.patch
Patch33: 0021-90multipath-install-correct-multipath-rules.patch
Patch34: add_dracuts_network_params_for_iscsi.patch
Patch35: 0022-90multipath-Fixup-service-file-for-booting.patch
BuildRequires: asciidoc
BuildRequires: bash
BuildRequires: docbook-xsl-stylesheets
@ -120,6 +121,7 @@ NFS, iSCSI, NBD, FCoE with the dracut-network package.
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35 -p1
%build
%configure\