From fa2e6ce7e3e7788df348c03bf787c15b4b35ab50 Mon Sep 17 00:00:00 2001 From: Victor Lowther Date: Fri, 6 Mar 2009 21:16:41 -0600 Subject: [PATCH] Added -c switch to dracut to use a custom dracut.conf Also some doc updates. --- HACKING | 1 - TODO | 3 --- dracut | 7 +++++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/HACKING b/HACKING index e9efe09ac..614aa506a 100644 --- a/HACKING +++ b/HACKING @@ -18,4 +18,3 @@ and set Requirements: * udev -* nash (for switchroot until we get in util-linux) diff --git a/TODO b/TODO index 3ced6f7e5..848ee2bf3 100644 --- a/TODO +++ b/TODO @@ -4,9 +4,6 @@ are/should be marked with "FIXME" in the code INITRAMFS TODO -------------- -* We have a horribly ugly switchroot implementation whose only - good point is that it gets rid of our dependency on nash. - It needs to be replaced by something nicer. * The hard-coded list of udev rules that we care about is kind of lame. See about getting /lib/udev/initrules.d or similar for storing the rules that we care about in the initramfs. These could be diff --git a/dracut b/dracut index 12d343141..ff22a670e 100755 --- a/dracut +++ b/dracut @@ -15,14 +15,17 @@ while (($# > 0)); do -h|--help) echo "Usage: $0 [-f] " exit 1 ;; -v|--verbose) set -x;; + -c|--conf) conffile="$2" -l|--local) allowlocal="yes" ;; --allow-missing) : ;; *) break ;; esac shift done -conffile="/etc/dracut.conf" -[[ $allowlocal && -f dracut.conf ]] && conffile="dracut.conf" +[[ -f $conffile ]] || { + conffile="/etc/dracut.conf" + [[ $allowlocal && -f dracut.conf ]] && conffile="dracut.conf" +} . "$conffile" [[ $allowlocal && -f dracut-functions ]] && dsrc="." || dsrc=/usr/lib/dracut -- 2.47.2