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
69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
From b302dd2a53864bdd4ff271275fa244f654cb92ca Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 26 Jun 2014 10:49:03 +0200
|
|
Subject: 95dasd_rules: fixup rd.dasd parsing
|
|
|
|
There were some errors when rd.dasd parsing, resulting in the
|
|
device never to be activated. And we should check for
|
|
cio_ignore even if a udev rules has been found.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95dasd_rules/parse-dasd.sh | 15 ++++++++-------
|
|
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
Index: dracut-042/modules.d/95dasd_rules/parse-dasd.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/95dasd_rules/parse-dasd.sh 2015-06-24 18:02:10.257423027 +0200
|
|
+++ dracut-042/modules.d/95dasd_rules/parse-dasd.sh 2015-06-24 18:02:10.589441929 +0200
|
|
@@ -29,6 +29,10 @@ create_udev_rule() {
|
|
esac
|
|
[ -z "${_drv}" ] && return 0
|
|
|
|
+ if [ -x /sbin/cio_ignore ] && cio_ignore -i $ccw > /dev/null ; then
|
|
+ cio_ignore -r $ccw
|
|
+ fi
|
|
+
|
|
[ -e ${_rule} ] && return 0
|
|
|
|
cat > $_rule <<EOF
|
|
@@ -36,9 +40,6 @@ ACTION=="add", SUBSYSTEM=="ccw", KERNEL=
|
|
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
|
|
@@ -46,7 +47,7 @@ for dasd_arg in $(getargs root=) $(getar
|
|
case $dasd_arg in
|
|
/dev/disk/by-path/ccw-*)
|
|
ccw_arg=${dasd_arg##*/}
|
|
- break;
|
|
+ ;;
|
|
esac
|
|
if [ -n "$ccw_arg" ] ; then
|
|
IFS="-"
|
|
@@ -75,8 +76,8 @@ for dasd_arg in $(getargs rd.dasd=); do
|
|
end=${1#0.0.}
|
|
shift
|
|
unset IFS
|
|
- for dev in $(seq $(( 10#$start )) $(( 10#$end )) ) ; do
|
|
- create_udev_rule $(printf "0.0.%04d" "$dev")
|
|
+ for dev in $(seq $(( 16#$start )) $(( 16#$end )) ) ; do
|
|
+ create_udev_rule $(printf "0.0.%04x" "$dev")
|
|
done
|
|
;;
|
|
*)
|
|
@@ -85,7 +86,7 @@ for dasd_arg in $(getargs rd.dasd=); do
|
|
ro=1
|
|
fi
|
|
dev=${dev#0.0.}
|
|
- create_udev_rule $(printf "0.0.%04d" $(( 10#$dev )) )
|
|
+ create_udev_rule $(printf "0.0.%04x" $(( 16#$dev )) )
|
|
shift
|
|
;;
|
|
esac
|