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
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
From db1065791dbcad5325e4c2732dc70d0334decc25 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..e9318f5
|
|
--- /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.4.5
|
|
|