Blame 0048-95zfcp-Make-installation-optional.patch

Harald Hoyer 4734ec
From 61c0665dad633fdd2358a1a2ce5d25d282673c1a 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:45 +0100
Harald Hoyer 4734ec
Subject: [PATCH] 95zfcp: Make installation optional
Harald Hoyer 4734ec
Harald Hoyer 4734ec
zfcp_cio_free is a RedHat-specific tool, so do not install this
Harald Hoyer 4734ec
module if the program isn't present.
Harald Hoyer 4734ec
Harald Hoyer 4734ec
Signed-off-by: Hannes Reinecke <hare@suse.de>
Harald Hoyer 4734ec
---
Harald Hoyer 4734ec
 modules.d/95zfcp/module-setup.sh | 4 +---
Harald Hoyer 4734ec
 1 file changed, 1 insertion(+), 3 deletions(-)
Harald Hoyer 4734ec
Harald Hoyer 4734ec
diff --git a/modules.d/95zfcp/module-setup.sh b/modules.d/95zfcp/module-setup.sh
Harald Hoyer 4734ec
index 5d9b506..dfbeed5 100755
Harald Hoyer 4734ec
--- a/modules.d/95zfcp/module-setup.sh
Harald Hoyer 4734ec
+++ b/modules.d/95zfcp/module-setup.sh
Harald Hoyer 4734ec
@@ -5,6 +5,7 @@
Harald Hoyer 4734ec
 # called by dracut
Harald Hoyer 4734ec
 check() {
Harald Hoyer 4734ec
     arch=$(uname -m)
Harald Hoyer 4734ec
+    [ -x /sbin/zfcp_cio_free ] || return 1
Harald Hoyer 4734ec
     [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1
Harald Hoyer 4734ec
 
Harald Hoyer 4734ec
     return 0
Harald Hoyer 4734ec
@@ -12,9 +13,6 @@ check() {
Harald Hoyer 4734ec
 
Harald Hoyer 4734ec
 # called by dracut
Harald Hoyer 4734ec
 depends() {
Harald Hoyer 4734ec
-    arch=$(uname -m)
Harald Hoyer 4734ec
-    [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1
Harald Hoyer 4734ec
-
Harald Hoyer 4734ec
     return 0
Harald Hoyer 4734ec
 }
Harald Hoyer 4734ec