[master/f21/rhel7-branch] Really fix issue with starting in cmdline mode on s390x. (#1040933)
Brian C. Lane
bcl at redhat.com
Mon Oct 20 20:29:28 UTC 2014
On Mon, Oct 20, 2014 at 03:26:20PM -0400, Samantha N. Bueno wrote:
> On Mon, Oct 20, 2014 at 11:56:32AM -0700, Brian C. Lane wrote:
> > On Mon, Oct 20, 2014 at 02:37:07PM -0400, Samantha N. Bueno wrote:
> > > On Thu, Oct 16, 2014 at 03:59:44PM +0200, Martin Kolman wrote:
> > > > On Thu, 2014-10-16 at 09:56 -0400, Samantha N. Bueno wrote:
> > > > >
> > > > Looks good, thanks & ACK! :)
> > >
> > > Thanks, RTT tested my updates.img though and found a bit of an issue
> > > with it. Hopefully this is the last time I post a fix for this bug.
> > >
> > > ====
> > >
> > > Set display mode if we're in cmdline mode or doing a ks install, so
> > > that output gets dumped to the x3270 console. Also do not prompt for
> > > ssh if we are doing a cmdline or ordinary ks installation, as it is
> > > unnecessary.
> > >
> > > Resolves: rhbz#1040933
> > > ---
> > > anaconda | 6 +++++-
> > > 1 file changed, 5 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/anaconda b/anaconda
> > > index d82d1e8..b8aede0 100755
> > > --- a/anaconda
> > > +++ b/anaconda
> > > @@ -793,9 +793,13 @@ 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 'ks' not in flags.cmdline and not flags.imageInstall:
> > > prompt_for_ssh()
> > > sys.exit(0)
> > > + if ('cmdline' or 'ks') in flags.cmdline:
> >
> > That's not going to work the way you'd hope. This will though:
> >
> > if any(a for a in ("cmdline", "ks") if a in flags.cmdline):
>
> > But I also don't see why cmdline needs to be checked here since it
> > should already be setting opts.display_mode (see parseArguments).
>
> Oops, you're right, I just removed this block to test and
> opts.display_mode is getting set correctly. And ks output is still
> getting dumped to the x3270 console as well.
>
> So, I guess this patch is only the first two lines of changes. Thanks
> for pointing that out.
np. Ack to those 2 lines then.
Oh, hey, line-item acking :)
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
More information about the anaconda-patches
mailing list