[master/rhel7-branch] Deprecate RUNKS cmdline option. (#1040933)
Samantha N. Bueno
sbueno+anaconda at redhat.com
Tue Sep 16 14:43:52 UTC 2014
Historically, one would enter RUNKS=1 and cmdline as boot parameters in
order to use non-interactive kickstart. However, since we no longer have
loader, RUNKS is rather redundant now, so render it a no-op by removing
the couple instances where we checked it in anaconda.
Based on a patch by Jan Stodola <jstodola at redhat.com>
Resolves: rhbz#1040933
---
anaconda | 6 +-----
pyanaconda/ui/tui/hubs/progress.py | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/anaconda b/anaconda
index 608176a..84c4947 100755
--- a/anaconda
+++ b/anaconda
@@ -791,13 +791,9 @@ 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 and not flags.imageInstall:
+ if 'TMUX' not in os.environ and flags.ksprompt and not flags.imageInstall:
prompt_for_ssh()
sys.exit(0)
- # If we get RUNKS, we default to cmdline display mode, because nothing
- # else will work. Kickstart options can still override.
- if "RUNKS" in flags.cmdline:
- opts.display_mode = 'c'
log.info("%s %s", sys.argv[0], getAnacondaVersionString())
diff --git a/pyanaconda/ui/tui/hubs/progress.py b/pyanaconda/ui/tui/hubs/progress.py
index c15793a..0861ce1 100644
--- a/pyanaconda/ui/tui/hubs/progress.py
+++ b/pyanaconda/ui/tui/hubs/progress.py
@@ -124,7 +124,7 @@ class ProgressHub(TUIHub):
# what it gets, it just quits.
self.input(None, None)
# cmdline mode, continue automatically
- if flags.automatedInstall and "RUNKS" in flags.cmdline:
+ if flags.automatedInstall and not flags.ksprompt:
# As above, pretend like we got input and just quit
self.input(None, None)
--
1.9.3
More information about the anaconda-patches
mailing list