3f26422f3a
- Rename patches to match git repository:
* old: 0013-Correct-paths-for-openSUSE.patch
new: 0011-Correct-paths-for-openSUSE.patch
* old: 0014-Check-for-plymouth-lib-directories.patch
new: 0012-Check-for-plymouth-lib-directories.patch
* old: dracut_do_not_update_booloader_if_no_kernel_is_found.patch
new: 0013-mkinitrd-suse-do-not-update-bootloader-if-no-kernel-.patch
* old: suse_grub_manpage.patch
new: 0014-Update-dracut-manpage-for-GRUB-Legacy-and-GRUB2.patch
* old: replace_dhclient_with_wickedd_dhcp_supplicants.patch
new: 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch
* old: 0015-add-new-s390x-specific-rule-files.patch
new: 0016-Add-new-s390x-specific-rule-files.patch
* old: change_write_ifcfg_to_suse.patch
new: 0017-45ifcfg-use-distro-specific-scripts.patch
* old: dracut-fix-whitespace-add-drivers_call.patch
new: 0018-mkinitrd-suse-Fix-whitespaces-when-adding-drivers.patch
* old: wait_for_network_race_condition_fix.patch
new: 0019-40network-Fix-race-condition-when-wait-for-networks.patch
* old: dracut-warpclock_module.patch
new: 0020-00warpclock-Set-correct-timezone.patch
* old: s390-dcssblk.patch
new: 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch
* old: dracut-install-persistent-rule.patch
new: 0022-95udev-rules-add-persistent-network-rule.patch
* old: dracut-really-always-add-autofs4.patch
new: 0023-systemd-always-tries-to-load-autofs4.patch
* old: mdraid-setup.patch
new: 0024-Fixup-mdraid-setup.patch
* old: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch
OBS-URL: https://build.opensuse.org/request/show/236221
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=156
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
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
|
|
|