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
69 lines
2.4 KiB
Diff
69 lines
2.4 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-041/modules.d/95dasd_rules/parse-dasd.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh 2015-03-17 13:19:07.747002492 +0100
|
|
+++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh 2015-03-17 13:19:29.908237657 +0100
|
|
@@ -29,6 +29,10 @@
|
|
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=="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 @@
|
|
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 @@
|
|
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 @@
|
|
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
|