kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(dracut.sh): do not ignore invalid config file or dir path 

Fix issue #1136
master
Antonio Alvarez Feijoo 2021-10-14 17:10:27 +02:00 committed by Jóhann B. Guðmundsson
parent 3d8e1ad2ae
commit 7de9ffc057
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dracut.sh
View File

@ -891,20 +891,26 @@ export DRACUT_LOG_LEVEL=warning
[[ $dracutbasedir ]] || dracutbasedir="$dracutsysrootdir"/usr/lib/dracut [[ $dracutbasedir ]] || dracutbasedir="$dracutsysrootdir"/usr/lib/dracut


# if we were not passed a config file, try the default one # if we were not passed a config file, try the default one
if [[ ! -f $conffile ]]; then if [[ -z $conffile ]]; then
if [[ $allowlocal ]]; then if [[ $allowlocal ]]; then
conffile="$dracutbasedir/dracut.conf" conffile="$dracutbasedir/dracut.conf"
else else
conffile="$dracutsysrootdir/etc/dracut.conf" conffile="$dracutsysrootdir/etc/dracut.conf"
fi fi
elif [[ ! -f $conffile ]]; then
printf "%s\n" "dracut: Configuration file '$conffile' not found." >&2
exit 1
fi fi


if [[ ! -d $confdir ]]; then if [[ -z $confdir ]]; then
if [[ $allowlocal ]]; then if [[ $allowlocal ]]; then
confdir="$dracutbasedir/dracut.conf.d" confdir="$dracutbasedir/dracut.conf.d"
else else
confdir="$dracutsysrootdir/etc/dracut.conf.d" confdir="$dracutsysrootdir/etc/dracut.conf.d"
fi fi
elif [[ ! -d $confdir ]]; then
printf "%s\n" "dracut: Configuration directory '$confdir' not found." >&2
exit 1
fi fi


# source our config file # source our config file