[PATCH f17-branch 1/3] dracut cleanup: use consistent filenames for cmdline.d files

[Will Woods <wwoods@xxxxxxxxxx>]

---
 dracut/anaconda-lib.sh           |    4 ++--
 dracut/parse-anaconda-options.sh |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh
index e03e0fb..2709a42 100755
--- a/dracut/anaconda-lib.sh
+++ b/dracut/anaconda-lib.sh
@@ -90,7 +90,7 @@ when_diskdev_appears() {
 
 set_neednet() {
     if ! getargbool 0 rd.neednet; then
-        echo "rd.neednet=1" >> /etc/cmdline.d/anaconda-neednet.conf
+        echo "rd.neednet=1" > /etc/cmdline.d/80-anaconda-neednet.conf
     fi
     unset CMDLINE
 }
@@ -114,7 +114,7 @@ save_netinfo() {
 }
 
 parse_kickstart() {
-    /sbin/parse-kickstart $1 > /etc/cmdline.d/80kickstart.conf
+    /sbin/parse-kickstart $1 > /etc/cmdline.d/80-kickstart.conf
     unset CMDLINE  # re-read the commandline
     . /tmp/ks.info # save the parsed kickstart
     [ -e "$parsed_kickstart" ] && cp $parsed_kickstart /run/install/ks.cfg
diff --git a/dracut/parse-anaconda-options.sh b/dracut/parse-anaconda-options.sh
index da18cae..57c88ee 100755
--- a/dracut/parse-anaconda-options.sh
+++ b/dracut/parse-anaconda-options.sh
@@ -57,7 +57,7 @@ check_depr_arg() {
     [ "$arg" ] || return 1
     newval=$(printf "$2" "$arg")
     [ "$quiet" ] || warn "'$1' is deprecated. Using '$newval' instead."
-    echo "$newval" >> /etc/cmdline.d/75anaconda-options.conf
+    echo "$newval" >> /etc/cmdline.d/75-anaconda-options.conf
 }
 check_depr_args() {
     local q=""
@@ -99,7 +99,7 @@ warn_renamed_arg "kssendsn" "inst.ks.sendsn"
 warn_renamed_arg "updates" "inst.updates"
 updates=$(getarg updates inst.updates)
 if [ -n "$updates" ]; then
-    echo "live.updates=$updates" >> /etc/cmdline.d/75anaconda-options.conf
+    echo "live.updates=$updates" >> /etc/cmdline.d/75-anaconda-options.conf
 fi
 
 # make sure we get ifcfg for every interface that comes up
-- 
1.7.7.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list