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())
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! :)
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())
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).
# 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
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.
# 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
-- Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT) _______________________________________________ anaconda-patches mailing list anaconda-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
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 :)
anaconda-patches@lists.fedorahosted.org