summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Sivak <msivak@redhat.com>2009-04-02 16:33:33 +0200
committerMartin Sivak <msivak@redhat.com>2009-04-02 16:33:33 +0200
commitb766a3532fc8a69002eda98856efcea3ccb0ad36 (patch)
tree9fd99b5cf7f6d5fb96cd5f3f3807a6095095f38d
parent5c72e04659fa744133ed101a4f40f6428c1b8d22 (diff)
downloadanaconda-b766a3532fc8a69002eda98856efcea3ccb0ad36.tar.gz
anaconda-b766a3532fc8a69002eda98856efcea3ccb0ad36.tar.xz
anaconda-b766a3532fc8a69002eda98856efcea3ccb0ad36.zip
rhel5 fix for cmdline being overridden by text when graphical install is detected as unworkable (#456325)
-rwxr-xr-xanaconda4
1 files changed, 2 insertions, 2 deletions
diff --git a/anaconda b/anaconda
index a6a759a52..f28a831eb 100755
--- a/anaconda
+++ b/anaconda
@@ -423,7 +423,7 @@ def checkMemory(opts):
# override display mode if machine cannot nicely run X
if not flags.test:
- if iutil.memInstalled() < isys.MIN_GUI_RAM:
+ if opts.display_mode not in ('t', 'c') and iutil.memInstalled() < isys.MIN_GUI_RAM:
stdoutLog.warning(_("You do not have enough RAM to use the graphical "
"installer. Starting text mode."))
opts.display_mode = 't'
@@ -840,7 +840,7 @@ if __name__ == "__main__":
# now determine if we're going to run in GUI or TUI mode
#
# if no X server, we have to use text mode
- if not (flags.test or flags.rootpath) and (rhpl.getArch() != "s390" and not os.access("/mnt/runtime/usr/bin/Xorg", os.X_OK)):
+ if opts.display_mode == 'g' and not (flags.test or flags.rootpath) and (rhpl.getArch() != "s390" and not os.access("/mnt/runtime/usr/bin/Xorg", os.X_OK)):
stdoutLog.warning(_("Graphical installation not available... "
"Starting text mode."))
time.sleep(2)