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

Samantha N. Bueno sbueno+anaconda at redhat.com
Thu Jul 25 20:12:06 UTC 2013


On Thu, Jul 25, 2013 at 11:40:08AM -0700, Brian C. Lane wrote:
> 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.

I was wondering about that. :) Thanks!

Samantha


More information about the anaconda-patches mailing list