9f28177407
- Update to dracut mainline version 041. Half of the patches got integrated mainline. Some others have been merged together when it made sense some have been left out, but are still in the repository as they need some special treating and mainline discussion whether/how they get added. These are also not urgently needed, but are debugging patches. I broke the rule here to mention every added/deleted/modified patch as every patch is touched and every 2nd got removed (mainline integrated). I also re-ordered the patches in the PatchXY: area for easier merging them and get them discussed and posted mainline easier, topic by topic. OBS-URL: https://build.opensuse.org/request/show/293267 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=214
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-041/modules.d/95zfcp_rules/module-setup.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/95zfcp_rules/module-setup.sh 2015-03-24 15:15:15.552000930 +0100
|
|
+++ dracut-041/modules.d/95zfcp_rules/module-setup.sh 2015-03-24 15:15:43.249556607 +0100
|
|
@@ -14,11 +14,11 @@
|
|
_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 @@
|
|
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));
|