[master/f21/rhel7-branch] Really fix issue with starting in cmdline mode on s390x. (#1040933)

Martin Kolman mkolman at redhat.com
Thu Oct 16 13:59:44 UTC 2014


On Thu, 2014-10-16 at 09:56 -0400, Samantha N. Bueno wrote:
> Apparently checking flags.ksprompt isn't good enough, so check whether
> cmdline is passed, since this is more reliable. Also, remember to actually
> set display_mode if we're in cmdline mode.
> 
> Resolves: rhbz#1040933
> ---
>  anaconda | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/anaconda b/anaconda
> index d82d1e8..2e39d90 100755
> --- a/anaconda
> +++ b/anaconda
> @@ -793,9 +793,12 @@ if __name__ == "__main__":
>      # see if we're on s390x and if we've got an ssh connection
>      uname = os.uname()
>      if uname[4] == 's390x':
> -        if 'TMUX' not in os.environ and not flags.ksprompt and not flags.imageInstall:
> +        if 'TMUX' not in os.environ and 'cmdline' not in flags.cmdline and not flags.imageInstall:
>              prompt_for_ssh()
>              sys.exit(0)
> +        if 'cmdline' in flags.cmdline:
> +            # non-interactive ks AKA cmdline mode
> +            opts.display_mode = 'c'
>  
>      log.info("%s %s", sys.argv[0], getAnacondaVersionString())
>  
Looks good, thanks & ACK! :)



More information about the anaconda-patches mailing list