* [PATCH] Make sure 'set -x' gets turned back on in wait_for_loginit
@ 2012-03-14 21:09 Will Woods
[not found] ` <1331759389-23864-1-git-send-email-wwoods-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Will Woods @ 2012-03-14 21:09 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA
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.
---
modules.d/99base/dracut-lib.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index f0d426c..6f506b6 100755
--- 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
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Make sure 'set -x' gets turned back on in wait_for_loginit
[not found] ` <1331759389-23864-1-git-send-email-wwoods-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2012-03-15 10:23 ` Harald Hoyer
0 siblings, 0 replies; 2+ messages in thread
From: Harald Hoyer @ 2012-03-15 10:23 UTC (permalink / raw)
To: Will Woods; +Cc: initramfs-u79uwXL29TY76Z2rM5mHXA
Am 14.03.2012 22:09, schrieb Will Woods:
> 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.
> ---
> modules.d/99base/dracut-lib.sh | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
> index f0d426c..6f506b6 100755
> --- 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
> }
>
pushed
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-15 10:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-14 21:09 [PATCH] Make sure 'set -x' gets turned back on in wait_for_loginit Will Woods
[not found] ` <1331759389-23864-1-git-send-email-wwoods-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-03-15 10:23 ` Harald Hoyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox