Normalize dasd argument content for dasd.conf

Also overwrite any existing files, contents from CMSCONFFILE override
any boot arguments.

diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
index 6aa456c8632e2e70bf33fb88b7ffe86c62770064..995bfa7aa3975b3eb94c85b8817cb84d3aade59d 100755 (executable)
--- a/modules.d/80cms/cmssetup.sh
+++ b/modules.d/80cms/cmssetup.sh
@@ -169,8 +169,8 @@ processcmsfile()
     fi
 
     if [[ $DASD ]]; then
-       echo $DASD >> /etc/dasd.conf
-       echo "options dasd_mod dasd=$DASD" >> /etc/modprobe.d/dasd_mod.conf
+       echo $DASD | normalize_dasd_arg > /etc/dasd.conf
+       echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf
        dasd_cio_free
     fi
 

diff --git a/modules.d/80cms/module-setup.sh b/modules.d/80cms/module-setup.sh
index 5cce1b41d5f90260563d43b3d72bd3aa924c8fd1..15dce89e8bd09d2cb6b908f64c3123d24dbb70ab 100755 (executable)
--- a/modules.d/80cms/module-setup.sh
+++ b/modules.d/80cms/module-setup.sh
@@ -34,5 +34,5 @@ install() {
     inst_libdir_file "gconv/*"
 #inst /usr/lib/locale/locale-archive
 
-    dracut_install cmsfs-fuse fusermount ulockmgr_server bash tr insmod rmmod cat
+    dracut_install cmsfs-fuse fusermount ulockmgr_server bash tr insmod rmmod cat normalize_dasd_arg
 }