[arch-releng] [PATCH 3/3] Use local varialbe helptext in interactive_configure_system

Dieter Plaetinck dieter at plaetinck.be
Wed Feb 9 16:10:15 EST 2011


On Tue,  8 Feb 2011 20:52:51 -0500
pyther at pyther.net wrote:

> Solves issue where helptext was global and bleed into
> interactive_bootloader_menu
> ---
>  src/core/libs/lib-ui-interactive.sh |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
> index 144749a..b4c9467 100644
> --- a/src/core/libs/lib-ui-interactive.sh
> +++ b/src/core/libs/lib-ui-interactive.sh
> @@ -57,6 +57,7 @@ interactive_configure_system()
>  	fi
>  
>  	local default=no
> +	local helptext
>  	while true; do
>  		helptext="\nNote that if you want to change any file not listed here (unlikely) you can go to another tty and update ${var_TARGET_DIR}/etc/<filename> yourself"
>  		grep -q '^/dev/mapper' $TMP_FSTAB && helptext="$helptext\n/dev/mapper/ users: Pay attention to HOOKS in mkinitcpio.conf"

this would only be needed because in your previous patch you removed the 'helptext=' line,
but you have a point in that the helptext variable should be local, both here and in
the interactive_grub_menulst() function.

Dieter


More information about the arch-releng mailing list