55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
|
From d4245680ba1cd00a15b86f5ccecd4b8be124f6e5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hannes Reinecke <hare@suse.de>
|
||
|
|
Date: Mon, 14 Jul 2014 10:17:07 +0200
|
||
|
|
Subject: 95zfcp_rules: Enable the device before checking device type
|
||
|
|
|
||
|
|
For creating dynamic udev rules parse-dasd.sh look for the device
|
||
|
|
type in sysfs, which of course does not exist if cio_ignore is
|
||
|
|
active. So first enable the device before checking.
|
||
|
|
|
||
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
||
|
|
---
|
||
|
|
modules.d/95zfcp_rules/parse-zfcp.sh | 10 ++++++----
|
||
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh
|
||
|
|
index 00f530f..8db3d9a 100755
|
||
|
|
--- a/modules.d/95zfcp_rules/parse-zfcp.sh
|
||
|
|
+++ b/modules.d/95zfcp_rules/parse-zfcp.sh
|
||
|
|
@@ -9,6 +9,10 @@ create_udev_rule() {
|
||
|
|
local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules
|
||
|
|
local _cu_type _dev_type
|
||
|
|
|
||
|
|
+ if [ -x /sbin/cio_ignore ] && cio_ignore -i $ccw > /dev/null ; then
|
||
|
|
+ cio_ignore -r $ccw
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
if [ -e /sys/bus/ccw/devices/${ccw} ] ; then
|
||
|
|
read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype
|
||
|
|
read _dev_type < /sys/bus/ccw/devices/${ccw}/devtype
|
||
|
|
@@ -20,10 +24,6 @@ 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
|
||
|
|
@@ -54,8 +54,10 @@ fi
|
||
|
|
|
||
|
|
for zfcp_arg in $(getargs rd.zfcp); do
|
||
|
|
(
|
||
|
|
+ local OLDIFS="$IFS"
|
||
|
|
local IFS=","
|
||
|
|
set $zfcp_arg
|
||
|
|
+ IFS="$OLDIFS"
|
||
|
|
create_udev_rule $1 $2 $3
|
||
|
|
)
|
||
|
|
done
|
||
|
|
--
|
||
|
|
1.8.4.5
|
||
|
|
|