fixed conffile and dracutmodules handling

master
Harald Hoyer 2009-03-07 12:18:09 +01:00
parent af2ac89151
commit e12aac5ee0
1 changed files with 4 additions and 4 deletions

6
dracut
View File

@ -24,10 +24,9 @@ while (($# > 0)); do
shift
done

[[ -f $conffile ]] || [[ -f /etc/dracut.conf ]] && conffile="/etc/dracut.conf"
[[ -f $conffile ]] || ( [[ -f /etc/dracut.conf ]] && conffile="/etc/dracut.conf" )
[[ -f $conffile ]] && . "$conffile"

[[ $dracutmodules_l ]] && dracutmodules=$dracutmodule_l
[[ $dracutmodules_l ]] && dracutmodules=$dracutmodules_l
[[ $modules_l ]] && modules=$modules_l

[[ $allowlocal && -f dracut-functions ]] && dsrc="." || dsrc=/usr/lib/dracut
@ -35,6 +34,7 @@ done

[[ $dracutmodules ]] || dracutmodules="all"


[[ $2 ]] && kernel=$2 || kernel=$(uname -r)
[[ $1 ]] && outfile=$(readlink -f $1) || outfile="/boot/initrd-$kernel.img"