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 52c81c8ee432b2641b75db194e24eb77e765b8af..f73cc556233ef13b1a49274321b4a650b36197e2 100755 (executable)
--- 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 0704c5cbb0dbf4b5be3cc089697890831c4badcc..628614a6269d9c2c78ea0f79e4612704efa2cfa5 100755 (executable)
--- 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 63a7da46cd199ffe55bc677bcda1e348573706e2..80ceb2f80dd10a6bdbeb42b83a619bc81f0a0b9f 100755 (executable)
--- 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 fea6bf7b9aba28ced3dc3f6d5e317340102d43e4..8d0e6e7f19f002a2aee5514ef90d3193adc035d5 100755 (executable)
--- 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 7fcee870322a972022639c114bc660fb6ff21725..4ec91ede6c260081e3a919175104da36c6e1d920 100755 (executable)
--- 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 7ff37b3b6881c6d33fb7690363d35d376e73cc01..7c1834306a3ecd32967a93efdff3c79dca9ee8c3 100755 (executable)
--- 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 846c85384b7abab4c0048c7fbafa48639f2eb1ba..8e839c34f724f3438a22627bfdb619e3ef3bdf20 100755 (executable)
--- 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