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

Samantha N. Bueno sbueno+anaconda at redhat.com
Mon Oct 20 18:37:07 UTC 2014


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:
+            # non-interactive ks AKA cmdline mode
+            # also for ks, so that we see console output on x3270
+            opts.display_mode = 'c'
 
     log.info("%s %s", sys.argv[0], getAnacondaVersionString())
 
-- 
1.9.3



More information about the anaconda-patches mailing list