Make sure 'set -x' gets turned back on in wait_for_loginit

wait_for_loginit does set +x (to turn off debugging temporarily), but
sometimes it would return before turning it back on. Move the set +x
line to fix that, then use 'setdebug' to make sure we don't turn it back
on unless it was needed.

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index f0d426ccdf61d834aa02fc07e1074ff8ba18713b..6f506b6c9225ec73e4cf6fa5fc7c05975af740be 100755 (executable)
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -756,9 +756,9 @@ need_shutdown() {
 
 wait_for_loginit()
 {
-    set +x
     [ "$RD_DEBUG" = "yes" ] || return
     [ -e /run/initramfs/loginit.pipe ] || return
+    set +x
     echo "DRACUT_LOG_END"
     exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
         # wait for loginit
@@ -778,7 +778,7 @@ wait_for_loginit()
         kill $(while read line;do echo $line;done</run/initramfs/loginit.pid)
     fi
 
-    set -x
+    setdebug
     rm -f /run/initramfs/loginit.pipe /run/initramfs/loginit.pid
 }