conffile before confdir

conffile should be sourced before confdir

Signed-off-by: Maarten Vanraes <maarten.vanraes@gmail.com>

diff --git a/dracut b/dracut
index 0a715746afa3865065e840a4548b1535314d3338..aea478bc784b319cd528f6e3dd223370df62e5b6 100755 (executable)
--- a/dracut
+++ b/dracut
@@ -130,6 +130,9 @@ if [[ ! -d $confdir ]]; then
     [[ $allowlocal ]] && confdir="$dracutbasedir/dracut.conf.d"
 fi
 
+# source our config file
+[[ -f $conffile ]] && . "$conffile"
+
 # source our config dir
 if [ "$confdir" ] && [  -d "$confdir" ]; then
     for f in "$confdir"/*.conf; do 
@@ -137,9 +140,6 @@ if [ "$confdir" ] && [  -d "$confdir" ]; then
     done
 fi
 
-# source our config file
-[[ -f $conffile ]] && . "$conffile"
-
 # these optins add to the stuff in the config file
 [[ $add_dracutmodules_l ]] && add_dracutmodules+=" $add_dracutmodules_l"
 [[ $add_drivers_l ]] && add_drivers+=" $add_drivers_l"