89f9350d9e
- Fix dmraid issue bnc#905746 A dracut_dmraid_use_udev.patch - Taken over from SLE12 A fips_add_aesni-intel.patch - Do not touch /run vs /var/run bnc#922676 D 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Update dracut to version 042 Remove these already included or unneeded patches: D dracut_v041_to_HEAD.patch D 0011-Correct-paths-for-openSUSE.patch D 0068-95fcoe-uefi-Test-for-EFI-firmware.patch D 0170-enable-logitech-hidpp.patch Adjust/refresh: M 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch M 0016-Add-new-s390x-specific-rule-files.patch M 0017-45ifcfg-use-distro-specific-scripts.patch M 0019-40network-Fix-race-condition-when-wait-for-networks.patch M 0020-00warpclock-Set-correct-timezone.patch M 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch M 0048-40network-Only-enable-network-interfaces-if-explicit.patch M 0053-01fips-fixup-loading-issues.patch M 0056-81cio_ignore-handle-cio_ignore-commandline.patch M 0057-01fips-Include-some-more-hmacs.patch M 0058-dracut-add-warning-when-including-unsupported-module.patch M 0059-99suse-Add-SUSE-specific-initrd-parsing.patch M 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch M 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch M 0066-40network-always-start-netroot-in-ifup.sh.patch M 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch M 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch OBS-URL: https://build.opensuse.org/request/show/314510 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=219
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 0be3d022964d54e8ab769ebed4006ba8b8d65078 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 10 Jul 2014 14:56:54 +0200
|
|
Subject: 95zfcp_rules: Store all devices in commandline
|
|
|
|
'for_each_host_dev_and_slaves' would stop at the first found
|
|
device, so the cmdline() call would never list all required
|
|
devices. Use 'for_each_host_dev_and_slaves_all' instead and
|
|
filter out duplicates.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95zfcp_rules/module-setup.sh | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
Index: dracut-042/modules.d/95zfcp_rules/module-setup.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/95zfcp_rules/module-setup.sh 2015-06-24 18:02:11.753508198 +0200
|
|
+++ dracut-042/modules.d/95zfcp_rules/module-setup.sh 2015-06-24 18:02:15.445718391 +0200
|
|
@@ -14,11 +14,11 @@ cmdline() {
|
|
_wwpn=$(cat ${_sdev}/wwpn)
|
|
_ccw=$(cat ${_sdev}/hba_id)
|
|
echo "rd.zfcp=${_ccw},${_wwpn},${_lun}"
|
|
- return 1
|
|
+ return 0
|
|
}
|
|
[[ $hostonly ]] || [[ $mount_needs ]] && {
|
|
- for_each_host_dev_and_slaves is_zfcp
|
|
- }
|
|
+ for_each_host_dev_and_slaves_all is_zfcp
|
|
+ } | sort | uniq
|
|
}
|
|
|
|
# called by dracut
|
|
@@ -29,6 +29,7 @@ check() {
|
|
require_binaries /usr/lib/udev/collect || return 1
|
|
|
|
[[ $hostonly ]] || [[ $mount_needs ]] && {
|
|
+ found=0
|
|
for _ccw in /sys/bus/ccw/devices/*/host* ; do
|
|
[ -d "$_ccw" ] || continue
|
|
found=$(($found+1));
|