Browse Source

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>
master
Hannes Reinecke 11 years ago committed by Daniel Molkentin
parent
commit
9be4be7aa7
  1. 11
      modules.d/95zfcp_rules/parse-zfcp.sh

11
modules.d/95zfcp_rules/parse-zfcp.sh

@ -5,9 +5,7 @@ create_udev_rule() {
local wwpn=$2 local wwpn=$2
local lun=$3 local lun=$3
local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules

local _cu_type _dev_type local _cu_type _dev_type
local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules


if [ -e /sys/bus/ccw/devices/${ccw} ] ; then if [ -e /sys/bus/ccw/devices/${ccw} ] ; then
read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype
@ -20,6 +18,10 @@ create_udev_rule() {
return 0; return 0;
fi fi


if [ -x /sbin/cio_ignore ] && cio_ignore -i $ccw > /dev/null ; then
cio_ignore -r $ccw
fi

[ -e ${_rule} ] && return 0 [ -e ${_rule} ] && return 0


if [ ! -f "$_rule" ] ; then if [ ! -f "$_rule" ] ; then
@ -35,9 +37,6 @@ EOF
ACTION=="add", KERNEL=="rport-*", ATTR{port_name}=="$wwpn", SUBSYSTEMS=="ccw", KERNELS=="$ccw", ATTR{[ccw/$ccw]$wwpn/unit_add}="$lun" ACTION=="add", KERNEL=="rport-*", ATTR{port_name}=="$wwpn", SUBSYSTEMS=="ccw", KERNELS=="$ccw", ATTR{[ccw/$ccw]$wwpn/unit_add}="$lun"
EOF EOF
fi 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 for zfcp_arg in $(getargs rd.zfcp); do
@ -53,7 +52,7 @@ for zfcp_arg in $(getargs root=) $(getargs resume=); do
case $zfcp_arg in case $zfcp_arg in
/dev/disk/by-path/ccw-*) /dev/disk/by-path/ccw-*)
ccw_arg=${zfcp_arg##*/} ccw_arg=${zfcp_arg##*/}
break; ;;
esac esac
if [ -n "$ccw_arg" ] ; then if [ -n "$ccw_arg" ] ; then
IFS="-" IFS="-"

Loading…
Cancel
Save