summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2022-06-10 12:52:20 +0200
committerSimon Rettberg2022-06-10 12:52:20 +0200
commitcb56c18170d99c91b6d6dc75cb1fb0c76ac6c6e1 (patch)
tree74dd93fd385dfb188f6f2bf26e7499fbdc52c092
parent[slx-network] Only redirect stderr to log files (diff)
downloadsystemd-init-cb56c18170d99c91b6d6dc75cb1fb0c76ac6c6e1.tar.gz
systemd-init-cb56c18170d99c91b6d6dc75cb1fb0c76ac6c6e1.tar.xz
systemd-init-cb56c18170d99c91b6d6dc75cb1fb0c76ac6c6e1.zip
[*] Redirect 'set -x' output exclusively to /run/openslx/*
Having normal info/warn/echo/<tool> output in journal should be preferred, so we can correlate certain events and actions with other system services and scripts, instead of having everything intermixed with the xtrace spam in a separate log file without timestamps.
-rwxr-xr-xmodules.d/slx-dmsetup/scripts/dmsetup-slx-device2
-rwxr-xr-xmodules.d/slx-network/scripts/setup-bootif-network.stage35
-rwxr-xr-xmodules.d/slx-network/scripts/udhcpc-trigger.stage32
3 files changed, 3 insertions, 6 deletions
diff --git a/modules.d/slx-dmsetup/scripts/dmsetup-slx-device b/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
index c05ef05c..4b087130 100755
--- a/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
+++ b/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
@@ -20,8 +20,8 @@
type -p emergency_shell || . /lib/dracut-lib.sh
# for debugging purposes
+exec {BASH_XTRACEFD}> /run/openslx/dmsetup.log
set -x
-exec &> /run/openslx/dmsetup.log
# read-only device to prepare for CoW
[ -z "$1" ] && emergency_shell "Read-only device was not given!"
diff --git a/modules.d/slx-network/scripts/setup-bootif-network.stage3 b/modules.d/slx-network/scripts/setup-bootif-network.stage3
index d901200d..7a2d7410 100755
--- a/modules.d/slx-network/scripts/setup-bootif-network.stage3
+++ b/modules.d/slx-network/scripts/setup-bootif-network.stage3
@@ -167,7 +167,4 @@ for i in 1 1 1 fail; do
done
set +x
-} 2> "/run/openslx/initramfs-network.log.$$"
-
-
-
+} {BASH_XTRACEFD}> "/run/openslx/initramfs-network.log.$$"
diff --git a/modules.d/slx-network/scripts/udhcpc-trigger.stage3 b/modules.d/slx-network/scripts/udhcpc-trigger.stage3
index bab33564..6649bf36 100755
--- a/modules.d/slx-network/scripts/udhcpc-trigger.stage3
+++ b/modules.d/slx-network/scripts/udhcpc-trigger.stage3
@@ -170,4 +170,4 @@ fi
touch /.network
set +x
-} 2> "/run/openslx/initramfs-udhcpc.log.$$"
+} {BASH_XTRACEFD}> "/run/openslx/initramfs-udhcpc.log.$$"