[rhel7/master][PATCH] Don't prompt for ssh on s390x if doing an image install. (#983056)

Brian C. Lane bcl at redhat.com
Thu Jul 25 18:40:08 UTC 2013


On Thu, Jul 25, 2013 at 01:38:11PM -0400, Samantha N. Bueno wrote:
> Resolves: rhbz#983056
> ---
>  anaconda | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/anaconda b/anaconda
> index 7b2fd0d..7c0480f 100755
> --- a/anaconda
> +++ b/anaconda
> @@ -713,7 +713,7 @@ 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 "RUNKS" not in flags.cmdline:
> +        if 'TMUX' not in os.environ and "RUNKS" not in flags.cmdline and not opts.images:
>              prompt_for_ssh()
>              sys.exit(0)
>          # If we get RUNKS, we default to cmdline display mode, because nothing
> -- 
> 1.7.11.7

I'd use flags.imageInstall since it just got set to True above this.
Ack otherwise.

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 482 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/anaconda-patches/attachments/20130725/0b6c3150/attachment.sig>


More information about the anaconda-patches mailing list