Normalize dasd argument content for dasd.conf

Also overwrite any existing files, contents from CMSCONFFILE override any boot arguments.
13 years ago · 965d14726a
2 changed files with 3 additions and 3 deletions
--- a/modules.d/80cms/cmssetup.sh
+++ b/modules.d/80cms/cmssetup.sh
@ -169,8 +169,8 @@ processcmsfile()
				@@ -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

--- a/modules.d/80cms/module-setup.sh
+++ b/modules.d/80cms/module-setup.sh
@ -34,5 +34,5 @@ install() {
				@@ -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
 }