bb76751d8a
- Rediff patches to match git repository
- 95fcoe: Check for FCoE devices prior to binaries
* Modify 0055-95fcoe-Only-install-fcoe-module-if-required.patch
- 99base: Install chown instead of chgrp
* Modify 0052-99base-Add-chown-binary.patch
- 95iscsi: do not try to detect iSCSI firmware during booting;
should be handled via commandline parameter
* Modify 0030-95iscsi-Autodetect-iSCSI-firmware.patch
- Rename patch:
* old: 0051-mkinitrd-suse-add-update-booloader-message.patch
new: 0051-mkinitrd-suse-add-update-bootloader-message.patch
OBS-URL: https://build.opensuse.org/request/show/236229
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=157
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From 4a01af95296882e364499728329a1f5bff05cc93 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Wed, 16 Apr 2014 09:35:28 +0200
|
|
Subject: [PATCH] 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 e9318f5..44a7b80 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.4.5
|
|
|