From cb56c18170d99c91b6d6dc75cb1fb0c76ac6c6e1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 10 Jun 2022 12:52:20 +0200
Subject: [*] 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.
---
 modules.d/slx-dmsetup/scripts/dmsetup-slx-device          | 2 +-
 modules.d/slx-network/scripts/setup-bootif-network.stage3 | 5 +----
 modules.d/slx-network/scripts/udhcpc-trigger.stage3       | 2 +-
 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.$$"
-- 
cgit v1.2.3-55-g7522