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
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
