Thomas Renninger
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
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From 90b21dafd469ce4a8ac56944ce825f90c0782b16 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 26 Jun 2014 11:52:29 +0200
|
|
Subject: 95zfcp_rules: Fixup rd.zfcp parsing
|
|
|
|
There were some errors when parsing rd.zfcp, causing the device
|
|
never to be activated.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95zfcp_rules/parse-zfcp.sh | 11 +++++------
|
|
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-17 13:20:19.735014330 +0100
|
|
+++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-17 13:20:19.835019903 +0100
|
|
@@ -5,9 +5,7 @@
|
|
local wwpn=$2
|
|
local lun=$3
|
|
local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules
|
|
-
|
|
local _cu_type _dev_type
|
|
- local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules
|
|
|
|
if [ -e /sys/bus/ccw/devices/${ccw} ] ; then
|
|
read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype
|
|
@@ -20,6 +18,10 @@
|
|
return 0;
|
|
fi
|
|
|
|
+ if [ -x /sbin/cio_ignore ] && cio_ignore -i $ccw > /dev/null ; then
|
|
+ cio_ignore -r $ccw
|
|
+ fi
|
|
+
|
|
[ -e ${_rule} ] && return 0
|
|
|
|
if [ ! -f "$_rule" ] ; then
|
|
@@ -35,9 +37,6 @@
|
|
ACTION=="add", KERNEL=="rport-*", ATTR{port_name}=="$wwpn", SUBSYSTEMS=="ccw", KERNELS=="$ccw", ATTR{[ccw/$ccw]$wwpn/unit_add}="$lun"
|
|
EOF
|
|
fi
|
|
- if [ -x /sbin/cio_ignore ] && ! cio_ignore -i $ccw > /dev/null ; then
|
|
- cio_ignore -r $ccw
|
|
- fi
|
|
}
|
|
|
|
for zfcp_arg in $(getargs rd.zfcp); do
|
|
@@ -53,7 +52,7 @@
|
|
case $zfcp_arg in
|
|
/dev/disk/by-path/ccw-*)
|
|
ccw_arg=${zfcp_arg##*/}
|
|
- break;
|
|
+ ;;
|
|
esac
|
|
if [ -n "$ccw_arg" ] ; then
|
|
IFS="-"
|