dracut-logger: turn off xtrace for log messages
Turn off xtrace for log messages and turn it back on, if $debug is set.master
parent
da22a02130
commit
1e64e4939f
3
dracut
3
dracut
|
@ -433,7 +433,8 @@ export initdir hookdirs dracutbasedir dracutmodules drivers \
|
||||||
fw_dir drivers_dir debug no_kernel kernel_only \
|
fw_dir drivers_dir debug no_kernel kernel_only \
|
||||||
add_drivers mdadmconf lvmconf filesystems \
|
add_drivers mdadmconf lvmconf filesystems \
|
||||||
use_fstab libdir usrlibdir \
|
use_fstab libdir usrlibdir \
|
||||||
stdloglvl sysloglvl fileloglvl kmsgloglvl logfile
|
stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
|
||||||
|
debug
|
||||||
|
|
||||||
if [[ $kernel_only != yes ]]; then
|
if [[ $kernel_only != yes ]]; then
|
||||||
# Create some directory structure first
|
# Create some directory structure first
|
||||||
|
|
|
@ -294,6 +294,7 @@ dlog() {
|
||||||
_do_dlog "$1" "$line"
|
_do_dlog "$1" "$line"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
[ -n "$debug" ] && set -x
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -302,6 +303,7 @@ dlog() {
|
||||||
# @param msg Message.
|
# @param msg Message.
|
||||||
# @retval 0 It's always returned, even if logging failed.
|
# @retval 0 It's always returned, even if logging failed.
|
||||||
dtrace() {
|
dtrace() {
|
||||||
|
set +x
|
||||||
dlog 6 "$@"
|
dlog 6 "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -310,6 +312,7 @@ dtrace() {
|
||||||
# @param msg Message.
|
# @param msg Message.
|
||||||
# @retval 0 It's always returned, even if logging failed.
|
# @retval 0 It's always returned, even if logging failed.
|
||||||
ddebug() {
|
ddebug() {
|
||||||
|
set +x
|
||||||
dlog 5 "$@"
|
dlog 5 "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -318,6 +321,7 @@ ddebug() {
|
||||||
# @param msg Message.
|
# @param msg Message.
|
||||||
# @retval 0 It's always returned, even if logging failed.
|
# @retval 0 It's always returned, even if logging failed.
|
||||||
dinfo() {
|
dinfo() {
|
||||||
|
set +x
|
||||||
dlog 4 "$@"
|
dlog 4 "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -326,6 +330,7 @@ dinfo() {
|
||||||
# @param msg Message.
|
# @param msg Message.
|
||||||
# @retval 0 It's always returned, even if logging failed.
|
# @retval 0 It's always returned, even if logging failed.
|
||||||
dwarn() {
|
dwarn() {
|
||||||
|
set +x
|
||||||
dlog 3 "$@"
|
dlog 3 "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -334,6 +339,7 @@ dwarn() {
|
||||||
# @param msg Message.
|
# @param msg Message.
|
||||||
# @retval 0 It's always returned, even if logging failed.
|
# @retval 0 It's always returned, even if logging failed.
|
||||||
dwarning() {
|
dwarning() {
|
||||||
|
set +x
|
||||||
dwarn "$@"
|
dwarn "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -342,6 +348,7 @@ dwarning() {
|
||||||
# @param msg Message.
|
# @param msg Message.
|
||||||
# @retval 0 It's always returned, even if logging failed.
|
# @retval 0 It's always returned, even if logging failed.
|
||||||
derror() {
|
derror() {
|
||||||
|
set +x
|
||||||
dlog 2 "$@"
|
dlog 2 "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -350,5 +357,6 @@ derror() {
|
||||||
# @param msg Message.
|
# @param msg Message.
|
||||||
# @retval 0 It's always returned, even if logging failed.
|
# @retval 0 It's always returned, even if logging failed.
|
||||||
dfatal() {
|
dfatal() {
|
||||||
|
set +x
|
||||||
dlog 1 "$@"
|
dlog 1 "$@"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue