dracut-logger: turn off xtrace for log messages

Turn off xtrace for log messages and turn it back on, if $debug is set.

diff --git a/dracut b/dracut
index 649637d353845b8acb66d213a5442bce17e5e78a..0c1cc147ea09d88bab7151169c8f628eecc2e635 100755 (executable)
--- a/dracut
+++ b/dracut
@@ -433,7 +433,8 @@ export initdir hookdirs dracutbasedir dracutmodules drivers \
     fw_dir drivers_dir debug no_kernel kernel_only \
     add_drivers mdadmconf lvmconf filesystems \
     use_fstab libdir usrlibdir \
-    stdloglvl sysloglvl fileloglvl kmsgloglvl logfile
+    stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
+    debug
 
 if [[ $kernel_only != yes ]]; then
     # Create some directory structure first

diff --git a/dracut-logger b/dracut-logger
index 830ce1c28dbcd652d89466738e5c461db0f13caf..f0c3eecd92da2987783ad4f1f1a1039a72b53fee 100755 (executable)
--- a/dracut-logger
+++ b/dracut-logger
@@ -294,6 +294,7 @@ dlog() {
             _do_dlog "$1" "$line"
         done
     fi
+    [ -n "$debug" ] && set -x
     return 0
 }
 
@@ -302,6 +303,7 @@ dlog() {
 # @param msg Message.
 # @retval 0 It's always returned, even if logging failed.
 dtrace() {
+    set +x
     dlog 6 "$@"
 }
 
@@ -310,6 +312,7 @@ dtrace() {
 # @param msg Message.
 # @retval 0 It's always returned, even if logging failed.
 ddebug() {
+    set +x
     dlog 5 "$@"
 }
 
@@ -318,6 +321,7 @@ ddebug() {
 # @param msg Message.
 # @retval 0 It's always returned, even if logging failed.
 dinfo() {
+    set +x
     dlog 4 "$@"
 }
 
@@ -326,6 +330,7 @@ dinfo() {
 # @param msg Message.
 # @retval 0 It's always returned, even if logging failed.
 dwarn() {
+    set +x
     dlog 3 "$@"
 }
 
@@ -334,6 +339,7 @@ dwarn() {
 # @param msg Message.
 # @retval 0 It's always returned, even if logging failed.
 dwarning() {
+    set +x
     dwarn "$@"
 }
 
@@ -342,6 +348,7 @@ dwarning() {
 # @param msg Message.
 # @retval 0 It's always returned, even if logging failed.
 derror() {
+    set +x
     dlog 2 "$@"
 }
 
@@ -350,5 +357,6 @@ derror() {
 # @param msg Message.
 # @retval 0 It's always returned, even if logging failed.
 dfatal() {
+    set +x
     dlog 1 "$@"
 }