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
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From 7a725ea4a1cb606edd3f060f46818250f2a82a1a Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Wed, 18 Jun 2014 15:17:21 +0200
|
|
Subject: Correctly set cio_ignore for dynamic s390 rules
|
|
|
|
When converting 'rd.zfcp' and 'rd.dasd' into udev rules we
|
|
need to make sure the enable those device ids via cio_ignore,
|
|
otherwise the rules might never be called.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95dasd_rules/parse-dasd.sh | 3 +++
|
|
modules.d/95zfcp_rules/parse-zfcp.sh | 3 +++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:13:36.566441368 +0100
|
|
+++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:13:39.238591451 +0100
|
|
@@ -36,6 +36,9 @@
|
|
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
|
|
Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-24 15:13:26.593881271 +0100
|
|
+++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-24 15:13:39.238591451 +0100
|
|
@@ -35,6 +35,9 @@
|
|
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
|