89f9350d9e
- Fix dmraid issue bnc#905746 A dracut_dmraid_use_udev.patch - Taken over from SLE12 A fips_add_aesni-intel.patch - Do not touch /run vs /var/run bnc#922676 D 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Update dracut to version 042 Remove these already included or unneeded patches: D dracut_v041_to_HEAD.patch D 0011-Correct-paths-for-openSUSE.patch D 0068-95fcoe-uefi-Test-for-EFI-firmware.patch D 0170-enable-logitech-hidpp.patch Adjust/refresh: M 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch M 0016-Add-new-s390x-specific-rule-files.patch M 0017-45ifcfg-use-distro-specific-scripts.patch M 0019-40network-Fix-race-condition-when-wait-for-networks.patch M 0020-00warpclock-Set-correct-timezone.patch M 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch M 0048-40network-Only-enable-network-interfaces-if-explicit.patch M 0053-01fips-fixup-loading-issues.patch M 0056-81cio_ignore-handle-cio_ignore-commandline.patch M 0057-01fips-Include-some-more-hmacs.patch M 0058-dracut-add-warning-when-including-unsupported-module.patch M 0059-99suse-Add-SUSE-specific-initrd-parsing.patch M 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch M 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch M 0066-40network-always-start-netroot-in-ifup.sh.patch M 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch M 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch OBS-URL: https://build.opensuse.org/request/show/314510 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=219
58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
From 90b21dafd469ce4a8ac56944ce825f90c0782b16 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 26 Jun 2014 11:52:29 +0200
|
|
Subject: 95zfcp_rules: Fixup rd.zfcp parsing
|
|
|
|
There were some errors when parsing rd.zfcp, causing the device
|
|
never to be activated.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95zfcp_rules/parse-zfcp.sh | 11 +++++------
|
|
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
Index: dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2015-06-24 18:02:10.257423027 +0200
|
|
+++ dracut-042/modules.d/95zfcp_rules/parse-zfcp.sh 2015-06-24 18:02:11.461491574 +0200
|
|
@@ -5,9 +5,7 @@ create_udev_rule() {
|
|
local wwpn=$2
|
|
local lun=$3
|
|
local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules
|
|
-
|
|
local _cu_type _dev_type
|
|
- local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules
|
|
|
|
if [ -e /sys/bus/ccw/devices/${ccw} ] ; then
|
|
read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype
|
|
@@ -20,6 +18,10 @@ 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
|
|
@@ -35,9 +37,6 @@ EOF
|
|
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
|
|
@@ -53,7 +52,7 @@ for zfcp_arg in $(getargs root=) $(getar
|
|
case $zfcp_arg in
|
|
/dev/disk/by-path/ccw-*)
|
|
ccw_arg=${zfcp_arg##*/}
|
|
- break;
|
|
+ ;;
|
|
esac
|
|
if [ -n "$ccw_arg" ] ; then
|
|
IFS="-"
|