50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From 7de9ffc0574790ecbad74b5a000ecd022d7736d4 Mon Sep 17 00:00:00 2001
|
|
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
|
|
Date: Thu, 14 Oct 2021 17:10:27 +0200
|
|
Subject: [PATCH] fix(dracut.sh): do not ignore invalid config file or dir path
|
|
|
|
Fix issue #1136
|
|
|
|
Reference:https://github.com/dracutdevs/dracut/commit/7de9ffc0574790ecbad74b5a000ecd022d7736d4
|
|
Conflict:NA
|
|
---
|
|
dracut.sh | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/dracut.sh b/dracut.sh
|
|
index ce54a851..20556762 100755
|
|
--- a/dracut.sh
|
|
+++ b/dracut.sh
|
|
@@ -891,20 +891,26 @@ export DRACUT_LOG_LEVEL=warning
|
|
[[ $dracutbasedir ]] || dracutbasedir="$dracutsysrootdir"/usr/lib/dracut
|
|
|
|
# if we were not passed a config file, try the default one
|
|
-if [[ ! -f $conffile ]]; then
|
|
+if [[ -z $conffile ]]; then
|
|
if [[ $allowlocal ]]; then
|
|
conffile="$dracutbasedir/dracut.conf"
|
|
else
|
|
conffile="$dracutsysrootdir/etc/dracut.conf"
|
|
fi
|
|
+elif [[ ! -f $conffile ]]; then
|
|
+ printf "%s\n" "dracut: Configuration file '$conffile' not found." >&2
|
|
+ exit 1
|
|
fi
|
|
|
|
-if [[ ! -d $confdir ]]; then
|
|
+if [[ -z $confdir ]]; then
|
|
if [[ $allowlocal ]]; then
|
|
confdir="$dracutbasedir/dracut.conf.d"
|
|
else
|
|
confdir="$dracutsysrootdir/etc/dracut.conf.d"
|
|
fi
|
|
+elif [[ ! -d $confdir ]]; then
|
|
+ printf "%s\n" "dracut: Configuration directory '$confdir' not found." >&2
|
|
+ exit 1
|
|
fi
|
|
|
|
# source our config file
|
|
--
|
|
2.27.0
|
|
|