375fc509c5
- Mark all scripts as executable (bnc#887010) * Remove: 0116-81cio_ignore-Mark-scripts-as-executable * Add: 0116-Mark-scripts-as-executable.patch - 95dasd_rules: Enable device before checking type * Add: 0117-95dasd_rules-Enable-the-device-before-checking-devic.patch - 95zfcp_rules: Enable device before checking type * Add: 0118-95zfcp_rules-Enable-the-device-before-checking-devic.patch - Reset IFS variable * Add: 0119-Reset-IFS-variable.patch - Handle module alias properly (bnc#886839) * Add: 0115-Handle-module-alias-properly.patch - 81cio_ignore: Mark scripts as executable (bnc#887010) * Add: 0116-81cio_ignore-Mark-scripts-as-executable.patch - 91zipl: Translate 'ext2' into 'ext4' module * Add: 0114-91zipl-Translate-ext2-3-into-ext4.patch - Enable converting of directory /var/run /var/lock to symlinks (bnc#877680) * Add: 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Fixup typo 'firmare' instead of 'firmware' * Add: 0107-Fixup-typo-firmare-instead-of-firmware.patch - 91zipl: Store commandline correctly * Add: 0108-91zipl-Store-commandline-correctly.patch - 95dasd_rules: Store all devices in commandline * 0109-95dasd_rules-Store-all-devices-in-commandline.patch - 95zfcp_rules: Store all devices in commandline * Add: 0110-95zfcp_rules-Store-all-devices-in-commandline.patch - 90mdraid: Remove line for 'offroot' detection OBS-URL: https://build.opensuse.org/request/show/240885 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=171
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
|
|
|