2014-06-25 17:13:52 +02:00
|
|
|
From 7a725ea4a1cb606edd3f060f46818250f2a82a1a Mon Sep 17 00:00:00 2001
|
|
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
|
|
Date: Wed, 18 Jun 2014 15:17:21 +0200
|
|
|
|
Subject: Correctly set cio_ignore for dynamic s390 rules
|
|
|
|
|
|
|
|
When converting 'rd.zfcp' and 'rd.dasd' into udev rules we
|
|
|
|
need to make sure the enable those device ids via cio_ignore,
|
|
|
|
otherwise the rules might never be called.
|
|
|
|
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
|
|
---
|
|
|
|
modules.d/95dasd_rules/parse-dasd.sh | 3 +++
|
|
|
|
modules.d/95zfcp_rules/parse-zfcp.sh | 3 +++
|
|
|
|
2 files changed, 6 insertions(+)
|
|
|
|
|
2015-06-30 14:59:59 +02:00
|
|
|
Index: dracut-042/modules.d/95dasd_rules/parse-dasd.sh
|
2015-03-31 16:12:12 +02:00
|
|
|
===================================================================
|
2015-06-30 14:59:59 +02:00
|
|
|
--- dracut-042.orig/modules.d/95dasd_rules/parse-dasd.sh 2015-06-24 18:02:09.969406631 +0200
|
|
|
|
+++ dracut-042/modules.d/95dasd_rules/parse-dasd.sh 2015-06-24 18:02:10.257423027 +0200
|
|
|
|
@@ -36,6 +36,9 @@ ACTION=="add", SUBSYSTEM=="ccw", KERNEL=
|
2014-06-25 17:13:52 +02:00
|
|
|
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
|
2015-06-30 14:59:59 +02:00
|
|
|
Index: dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh
|
2015-03-31 16:12:12 +02:00
|
|
|
===================================================================
|
2015-06-30 14:59:59 +02:00
|
|
|
--- dracut-042.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2015-06-11 17:39:47.000000000 +0200
|
|
|
|
+++ dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh 2015-06-24 18:02:10.257423027 +0200
|
|
|
|
@@ -35,6 +35,9 @@ EOF
|
2014-06-25 17:13:52 +02:00
|
|
|
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
|