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
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
From 985b280a49b90f0daa3e7b0a142099ae829efe12 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Tue, 8 Apr 2014 10:04:41 +0200
|
|
Subject: [PATCH] 90multipath: install dracut-specific service file
|
|
|
|
The multipathd package might install a service and a socket
|
|
file. Using the original service file from the installed
|
|
system without the socket file triggers a bug in systemd,
|
|
causing systemd to crash.
|
|
|
|
As we don't actually need to socket file in the initrd we
|
|
should be installing our own service file which does not
|
|
reference the socket file at all.
|
|
|
|
References: bnc#871610
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/90multipath/module-setup.sh | 3 +--
|
|
modules.d/90multipath/multipathd.service | 15 +++++++++++++++
|
|
2 files changed, 16 insertions(+), 2 deletions(-)
|
|
create mode 100644 modules.d/90multipath/multipathd.service
|
|
|
|
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
|
|
index c2bbdb4..9715851 100755
|
|
--- a/modules.d/90multipath/module-setup.sh
|
|
+++ b/modules.d/90multipath/module-setup.sh
|
|
@@ -91,8 +91,7 @@ install() {
|
|
inst_libdir_file "libmultipath*" "multipath/*"
|
|
|
|
if dracut_module_included "systemd"; then
|
|
- inst_multiple \
|
|
- $systemdsystemunitdir/multipathd.service
|
|
+ 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"
|
|
else
|
|
diff --git a/modules.d/90multipath/multipathd.service b/modules.d/90multipath/multipathd.service
|
|
new file mode 100644
|
|
index 0000000..01e497c
|
|
--- /dev/null
|
|
+++ b/modules.d/90multipath/multipathd.service
|
|
@@ -0,0 +1,15 @@
|
|
+[Unit]
|
|
+Description=Device-Mapper Multipath Device Controller
|
|
+Before=iscsi.service iscsid.service lvm2-activation-early.service
|
|
+DefaultDependencies=no
|
|
+Conflicts=shutdown.target
|
|
+
|
|
+[Service]
|
|
+Type=forking
|
|
+ExecStartPre=/sbin/modprobe dm-multipath
|
|
+ExecStart=/sbin/multipathd
|
|
+ExecReload=/sbin/multipathd reconfigure
|
|
+ExecStop=/sbin/multipathd shutdown
|
|
+
|
|
+[Install]
|
|
+WantedBy=sysinit.target
|
|
--
|
|
1.8.1.4
|
|
|