95dasd_rules: fixup rd.dasd parsing

There were some errors when rd.dasd parsing, resulting in the
device never to be activated. And we should check for
cio_ignore even if a udev rules has been found.

Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/modules.d/95dasd_rules/parse-dasd.sh b/modules.d/95dasd_rules/parse-dasd.sh
index 5be77c8153ddf3f7428f5b1ceb1c0ca3d08f6ddf..146f24fb83e5c25ea99a2f57ccfac5d141d6bab8 100755 (executable)
--- a/modules.d/95dasd_rules/parse-dasd.sh
+++ b/modules.d/95dasd_rules/parse-dasd.sh
@@ -29,6 +29,10 @@ create_udev_rule() {
     esac
     [ -z "${_drv}" ] && return 0
 
+    if [ -x /sbin/cio_ignore ] && cio_ignore -i $ccw > /dev/null ; then
+        cio_ignore -r $ccw
+    fi
+
     [ -e ${_rule} ] && return 0
 
     cat > $_rule <<EOF
@@ -36,9 +40,6 @@ ACTION=="add", SUBSYSTEM=="ccw", KERNEL=="$ccw", IMPORT{program}="collect $ccw %
 ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$_drv", IMPORT{program}="collect $ccw %k ${ccw} $_drv"
 ACTION=="add", ENV{COLLECT_$ccw}=="0", ATTR{[ccw/$ccw]online}="1"
 EOF
-    if [ -x /sbin/cio_ignore ] && ! cio_ignore -i $ccw > /dev/null ; then
-        cio_ignore -r $ccw
-    fi
 }
 
 for dasd_arg in $(getargs root=) $(getargs resume=); do
@@ -46,7 +47,7 @@ for dasd_arg in $(getargs root=) $(getargs resume=); do
         case $dasd_arg in
             /dev/disk/by-path/ccw-*)
                 ccw_arg=${dasd_arg##*/}
-                break;
+                ;;
         esac
         if [ -n "$ccw_arg" ] ; then
             IFS="-"
@@ -75,8 +76,8 @@ for dasd_arg in $(getargs rd.dasd=); do
                     end=${1#0.0.}
                     shift
                     unset IFS
-                    for dev in $(seq $(( 10#$start )) $(( 10#$end )) ) ; do
-                        create_udev_rule $(printf "0.0.%04d" "$dev")
+                    for dev in $(seq $(( 16#$start )) $(( 16#$end )) ) ; do
+                        create_udev_rule $(printf "0.0.%04x" "$dev")
                     done
                     ;;
                 *)
@@ -85,7 +86,7 @@ for dasd_arg in $(getargs rd.dasd=); do
                         ro=1
                     fi
                     dev=${dev#0.0.}
-                    create_udev_rule $(printf "0.0.%04d" $(( 10#$dev )) )
+                    create_udev_rule $(printf "0.0.%04x" $(( 16#$dev )) )
                     shift
                     ;;
             esac