From: Harald Hoyer <harald@redhat.com>
Date: Wed, 13 Jan 2010 13:26:46 +0000 (+0100)
Subject: s390: add call to *_cio_free and use current s390utils udev rules
X-Git-Tag: 004~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1603bf7e404c13b4dd7312901e6153f45b8352a;p=thirdparty%2Fdracut.git

s390: add call to *_cio_free and use current s390utils udev rules
---

diff --git a/modules.d/95dasd/install b/modules.d/95dasd/install
index 52c81c8ee..f73cc5562 100755
--- a/modules.d/95dasd/install
+++ b/modules.d/95dasd/install
@@ -1,8 +1,8 @@
 #!/bin/bash
 inst_hook cmdline 30 "$moddir/parse-dasd.sh"
-dracut_install tr
+dracut_install tr dasdinfo dasdconf.sh
 if [[ $hostonly ]]; then
     inst /etc/dasd.conf
 fi
-inst /sbin/dasdconf.sh
 inst_rules 56-dasd.rules
+inst_rules 59-dasd.rules
diff --git a/modules.d/95dasd_mod/install b/modules.d/95dasd_mod/install
index 0704c5cbb..628614a62 100755
--- a/modules.d/95dasd_mod/install
+++ b/modules.d/95dasd_mod/install
@@ -1,3 +1,4 @@
 #!/bin/bash
 inst_hook cmdline 30 "$moddir/parse-dasd-mod.sh"
+dracut_install dasd_cio_free grep sed
 
diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
index 63a7da46c..80ceb2f80 100755
--- a/modules.d/95dasd_mod/parse-dasd-mod.sh
+++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
@@ -6,3 +6,5 @@ if [ -n "$dasd_arg" ]; then
 	echo "options dasd_mod dasd=$dasd_arg" >> /etc/modprobe.d/dasd_mod.conf
 fi
 unset dasd_arg
+
+dasd_cio_free
diff --git a/modules.d/95zfcp/install b/modules.d/95zfcp/install
index fea6bf7b9..8d0e6e7f1 100755
--- a/modules.d/95zfcp/install
+++ b/modules.d/95zfcp/install
@@ -1,8 +1,12 @@
 #!/bin/bash
 inst_hook cmdline 30 "$moddir/parse-zfcp.sh"
 dracut_install tr
+
 inst "$moddir/zfcpconf.sh" /sbin/zfcpconf.sh
-inst_rules "$moddir/56-zfcp.rules"
+inst_rules 56-zfcp.rules
+
 if [[ $hostonly ]]; then
     inst /etc/zfcp.conf
 fi
+dracut_install zfcp_cio_free grep sed
+
diff --git a/modules.d/95zfcp/parse-zfcp.sh b/modules.d/95zfcp/parse-zfcp.sh
index 7fcee8703..4ec91ede6 100755
--- a/modules.d/95zfcp/parse-zfcp.sh
+++ b/modules.d/95zfcp/parse-zfcp.sh
@@ -9,3 +9,4 @@ for zfcp_arg in $(getargs 'rd_ZFCP='); do
     )
 done
 
+zfcp_cio_free
diff --git a/modules.d/95znet/install b/modules.d/95znet/install
index 7ff37b3b6..7c1834306 100755
--- a/modules.d/95znet/install
+++ b/modules.d/95znet/install
@@ -3,3 +3,4 @@ inst_hook cmdline 30 "$moddir/parse-ccw.sh"
 inst "$moddir/ccw_init" /lib/udev/ccw_init
 #inst_rules 55-ccw.rules || inst_rules "$moddir/55-ccw.rules"
 inst_rules "$moddir/55-ccw.rules"
+dracut_install znet_cio_free grep sed
diff --git a/modules.d/95znet/parse-ccw.sh b/modules.d/95znet/parse-ccw.sh
index 846c85384..8e839c34f 100755
--- a/modules.d/95znet/parse-ccw.sh
+++ b/modules.d/95znet/parse-ccw.sh
@@ -3,3 +3,4 @@ for ccw_arg in $(getargs 'rd_CCW='); do
     echo $ccw_arg >> /etc/ccw.conf
 done
 
+znet_cio_free