mirror of
https://github.com/dracutdevs/dracut.git
synced 2024-10-28 18:55:32 +03:00
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.
This commit is contained in:
parent
8cd592dfcb
commit
478314a90e
@ -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
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user