File 0083-95zfcp_rules-Fixup-rd.zfcp-parsing.patch of Package dracut

Overview Repositories Revisions Requests Users Attributes Meta

File 0083-95zfcp_rules-Fixup-rd.zfcp-parsing.patch of Package dracut (Revision 4478882416b264243a6a6065edc81766)

Currently displaying revision 4478882416b264243a6a6065edc81766 , Show latest

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(-)

diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh
index 56152da..bb5cd3a 100755
--- a/modules.d/95zfcp_rules/parse-zfcp.sh
+++ b/modules.d/95zfcp_rules/parse-zfcp.sh
@@ -7,9 +7,7 @@ create_udev_rule() {
     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
@@ -22,6 +20,10 @@ create_udev_rule() {
         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
@@ -37,9 +39,6 @@ EOF
 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
@@ -55,7 +54,7 @@ for zfcp_arg in $(getargs root=) $(getargs resume=); do
         case $zfcp_arg in
             /dev/disk/by-path/ccw-*)
                 ccw_arg=${zfcp_arg##*/}
-                break;
+                ;;
         esac
         if [ -n "$ccw_arg" ] ; then
             OLDIFS="$IFS"
-- 
1.8.4.5

Places

File 0083-95zfcp_rules-Fixup-rd.zfcp-parsing.patch of Package dracut (Revision 4478882416b264243a6a6065edc81766)

Places