|
|
|
|
|
From 81a6e87f0f183c1ddf8808bb52be09e3070caefd Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
|
|
|
|
Date: Fri, 29 Nov 2013 13:13:49 +0100
|
|
|
|
|
|
Subject: [PATCH] Make logfile configurable
|
|
|
|
|
|
|
|
|
|
|
|
Add '--logfile' option to make the log file configurable during
|
|
|
|
|
|
runtime.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
|
|
|
|
(cherry picked from commit ee54b8404c10e29e5bddb633a4c7becb7acb0632)
|
|
|
|
|
|
---
|
|
|
|
|
|
dracut.8.asc | 6 ++++++
|
|
|
|
|
|
dracut.sh | 4 ++++
|
|
|
|
|
|
2 files changed, 10 insertions(+)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/dracut.8.asc b/dracut.8.asc
|
|
|
|
|
|
index f97074a2..14ce26b6 100644
|
|
|
|
|
|
--- a/dracut.8.asc
|
|
|
|
|
|
+++ b/dracut.8.asc
|
|
|
|
|
|
@@ -275,6 +275,12 @@ Default:
|
|
|
|
|
|
|
|
|
|
|
|
**--sshkey** _<sshkey file>_:: ssh key file used with ssh-client module.
|
|
|
|
|
|
|
|
|
|
|
|
+**--logfile** _<logfile>_:: logfile to use; overrides any setting from
|
|
|
|
|
|
+ the configuration files.
|
|
|
|
|
|
++
|
|
|
|
|
|
+Default:
|
|
|
|
|
|
+ _/var/log/dracut.log_
|
|
|
|
|
|
+
|
|
|
|
|
|
**-l, --local**::
|
|
|
|
|
|
activates the local mode. dracut will use modules from the current working
|
|
|
|
|
|
directory instead of the system-wide installed modules in
|
|
|
|
|
|
diff --git a/dracut.sh b/dracut.sh
|
|
|
|
|
|
index f560dd1e..8e5e86f7 100755
|
|
|
|
|
|
--- a/dracut.sh
|
|
|
|
|
|
+++ b/dracut.sh
|
|
|
|
|
|
@@ -187,6 +187,7 @@ Creates initial ramdisk images for preloading modules
|
|
|
|
|
|
--keep Keep the temporary initramfs for debugging purposes
|
|
|
|
|
|
--printsize Print out the module install size
|
|
|
|
|
|
--sshkey [SSHKEY] Add ssh key to initramfs (use with ssh-client module)
|
|
|
|
|
|
+ --logfile [FILE] Logfile to use (overrides configuration setting)
|
|
|
|
|
|
|
|
|
|
|
|
If [LIST] has multiple arguments, then you have to put these in quotes.
|
|
|
|
|
|
|
|
|
|
|
|
@@ -340,6 +341,7 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \
|
|
|
|
|
|
--long debug \
|
|
|
|
|
|
--long profile \
|
|
|
|
|
|
--long sshkey: \
|
|
|
|
|
|
+ --long logfile: \
|
|
|
|
|
|
--long verbose \
|
|
|
|
|
|
--long quiet \
|
|
|
|
|
|
--long local \
|
|
|
|
|
|
@@ -430,6 +432,7 @@ while :; do
|
|
|
|
|
|
--debug) debug="yes";;
|
|
|
|
|
|
--profile) profile="yes";;
|
|
|
|
|
|
--sshkey) sshkey="$2"; shift;;
|
|
|
|
|
|
+ --logfile) logfile_l="$2"; shift;;
|
|
|
|
|
|
-v|--verbose) ((verbosity_mod_l++));;
|
|
|
|
|
|
-q|--quiet) ((verbosity_mod_l--));;
|
|
|
|
|
|
-l|--local)
|
|
|
|
|
|
@@ -709,6 +712,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
|
|
|
|
|
|
[[ $ro_mnt_l ]] && ro_mnt="yes"
|
|
|
|
|
|
[[ $early_microcode_l ]] && early_microcode=$early_microcode_l
|
|
|
|
|
|
[[ $early_microcode ]] || early_microcode=no
|
|
|
|
|
|
+[[ $logfile_l ]] && logfile="$logfile_l"
|
|
|
|
|
|
# eliminate IFS hackery when messing with fw_dir
|
|
|
|
|
|
fw_dir=${fw_dir//:/ }
|
|
|
|
|
|
|
