Browse Source

conffile before confdir

conffile should be sourced before confdir

Signed-off-by: Maarten Vanraes <maarten.vanraes@gmail.com>
master
Andrey Borzenkov 14 years ago committed by Harald Hoyer
parent
commit
2245f3723b
  1. 6
      dracut

6
dracut

@ -130,6 +130,9 @@ if [[ ! -d $confdir ]]; then @@ -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 @@ -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"

Loading…
Cancel
Save