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
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 95dc2742b9304029068a2b320e011bdfcc4087ea Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 26 Jun 2014 10:53:01 +0200
|
|
Subject: 95dasd_mod: do not set module parameters if dasd_cio_free is not
|
|
present
|
|
|
|
We're now parsing the 'rd.dasd' parameter from 95dasd_rules, so
|
|
setting the 'dasd_mod' module parameter should be dropped here.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95dasd_mod/parse-dasd-mod.sh | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
Index: dracut-041/modules.d/95dasd_mod/parse-dasd-mod.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/95dasd_mod/parse-dasd-mod.sh 2015-03-24 15:14:11.284391294 +0100
|
|
+++ dracut-041/modules.d/95dasd_mod/parse-dasd-mod.sh 2015-03-24 15:14:27.173283690 +0100
|
|
@@ -7,7 +7,7 @@
|
|
|
|
mod_args="${mod_args#*,}"
|
|
|
|
-if [ -n "$mod_args" ]; then
|
|
+if [ -x /sbin/dasd_cio_free -a -n "$mod_args" ]; then
|
|
[ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d
|
|
echo "options dasd_mod dasd=$mod_args" >> /etc/modprobe.d/dasd_mod.conf
|
|
fi
|