Thomas Renninger
9f28177407
- Update to dracut mainline version 041. Half of the patches got integrated mainline. Some others have been merged together when it made sense some have been left out, but are still in the repository as they need some special treating and mainline discussion whether/how they get added. These are also not urgently needed, but are debugging patches. I broke the rule here to mention every added/deleted/modified patch as every patch is touched and every 2nd got removed (mainline integrated). I also re-ordered the patches in the PatchXY: area for easier merging them and get them discussed and posted mainline easier, topic by topic. OBS-URL: https://build.opensuse.org/request/show/293267 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=214
41 lines
1.4 KiB
Diff
41 lines
1.4 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(-)
|
|
|
|
Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-17 17:40:04.923688032 +0100
|
|
+++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-17 17:40:05.135699878 +0100
|
|
@@ -7,6 +7,10 @@
|
|
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
|
|
@@ -18,10 +22,6 @@
|
|
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
|