Blame 0047-95dasd_mod-make-dasd_cio_free-optional.patch

Harald Hoyer 4734ec
From 8b2b77e460663b3fe45e0eea2f4a5babe4b731bc Mon Sep 17 00:00:00 2001
Harald Hoyer 4734ec
From: Hannes Reinecke <hare@suse.de>
Harald Hoyer 4734ec
Date: Fri, 29 Nov 2013 13:13:44 +0100
Harald Hoyer 4734ec
Subject: [PATCH] 95dasd_mod: make dasd_cio_free optional
Harald Hoyer 4734ec
Harald Hoyer 4734ec
dasd_cio_free is a RedHat-specific tool, so make it optional.
Harald Hoyer 4734ec
Harald Hoyer 4734ec
Signed-off-by: Hannes Reinecke <hare@suse.de>
Harald Hoyer 4734ec
---
Harald Hoyer 4734ec
 modules.d/95dasd_mod/module-setup.sh   | 3 ++-
Harald Hoyer 4734ec
 modules.d/95dasd_mod/parse-dasd-mod.sh | 4 +++-
Harald Hoyer 4734ec
 2 files changed, 5 insertions(+), 2 deletions(-)
Harald Hoyer 4734ec
Harald Hoyer 4734ec
diff --git a/modules.d/95dasd_mod/module-setup.sh b/modules.d/95dasd_mod/module-setup.sh
Harald Hoyer 4734ec
index 011010d..8fde525 100755
Harald Hoyer 4734ec
--- a/modules.d/95dasd_mod/module-setup.sh
Harald Hoyer 4734ec
+++ b/modules.d/95dasd_mod/module-setup.sh
Harald Hoyer 4734ec
@@ -23,6 +23,7 @@ installkernel() {
Harald Hoyer 4734ec
 # called by dracut
Harald Hoyer 4734ec
 install() {
Harald Hoyer 4734ec
     inst_hook cmdline 31 "$moddir/parse-dasd-mod.sh"
Harald Hoyer 4734ec
-    inst_multiple dasd_cio_free grep sed seq
Harald Hoyer 4734ec
+    inst_multiple grep sed seq
Harald Hoyer 4734ec
+    inst_multiple -o dasd_cio_free
Harald Hoyer 4734ec
 }
Harald Hoyer 4734ec
 
Harald Hoyer 4734ec
diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
Harald Hoyer 4734ec
index 87c88ed..0236d12 100755
Harald Hoyer 4734ec
--- a/modules.d/95dasd_mod/parse-dasd-mod.sh
Harald Hoyer 4734ec
+++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
Harald Hoyer 4734ec
@@ -15,4 +15,6 @@ if [ -n "$mod_args" ]; then
Harald Hoyer 4734ec
 fi
Harald Hoyer 4734ec
 
Harald Hoyer 4734ec
 unset dasd_arg
Harald Hoyer 4734ec
-dasd_cio_free
Harald Hoyer 4734ec
+if [ -x /sbin/dasd_cio_free ] ; then
Harald Hoyer 4734ec
+    dasd_cio_free
Harald Hoyer 4734ec
+fi