From: Jesse Keating <jkeating@redhat.com>
Date: Fri, 18 May 2012 21:50:20 +0000 (-0700)
Subject: Normalize dasd argument content for dasd.conf
X-Git-Tag: 019~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=965d14726abc7506e046f86dbf53a8644439e25b;p=thirdparty%2Fdracut.git

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 6aa456c86..995bfa7aa 100755
--- 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 5cce1b41d..15dce89e8 100755
--- 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
 }