375fc509c5
- Mark all scripts as executable (bnc#887010) * Remove: 0116-81cio_ignore-Mark-scripts-as-executable * Add: 0116-Mark-scripts-as-executable.patch - 95dasd_rules: Enable device before checking type * Add: 0117-95dasd_rules-Enable-the-device-before-checking-devic.patch - 95zfcp_rules: Enable device before checking type * Add: 0118-95zfcp_rules-Enable-the-device-before-checking-devic.patch - Reset IFS variable * Add: 0119-Reset-IFS-variable.patch - Handle module alias properly (bnc#886839) * Add: 0115-Handle-module-alias-properly.patch - 81cio_ignore: Mark scripts as executable (bnc#887010) * Add: 0116-81cio_ignore-Mark-scripts-as-executable.patch - 91zipl: Translate 'ext2' into 'ext4' module * Add: 0114-91zipl-Translate-ext2-3-into-ext4.patch - Enable converting of directory /var/run /var/lock to symlinks (bnc#877680) * Add: 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Fixup typo 'firmare' instead of 'firmware' * Add: 0107-Fixup-typo-firmare-instead-of-firmware.patch - 91zipl: Store commandline correctly * Add: 0108-91zipl-Store-commandline-correctly.patch - 95dasd_rules: Store all devices in commandline * 0109-95dasd_rules-Store-all-devices-in-commandline.patch - 95zfcp_rules: Store all devices in commandline * Add: 0110-95zfcp_rules-Store-all-devices-in-commandline.patch - 90mdraid: Remove line for 'offroot' detection OBS-URL: https://build.opensuse.org/request/show/240885 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=171
46 lines
1.4 KiB
Diff
46 lines
1.4 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(-)
|
|
|
|
diff --git a/modules.d/95zfcp_rules/module-setup.sh b/modules.d/95zfcp_rules/module-setup.sh
|
|
index 3f80754..df13fa1 100755
|
|
--- a/modules.d/95zfcp_rules/module-setup.sh
|
|
+++ b/modules.d/95zfcp_rules/module-setup.sh
|
|
@@ -16,11 +16,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
|
|
@@ -31,6 +31,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));
|
|
--
|
|
1.8.4.5
|
|
|