summaryrefslogtreecommitdiffstats
path: root/anaconda
diff options
context:
space:
mode:
authorMartin Sivak <msivak@redhat.com>2008-07-21 15:28:25 +0200
committerMartin Sivak <msivak@redhat.com>2008-07-21 15:32:26 +0200
commitb6a080fabaae89969be6e0d5cee0bde45143f8de (patch)
tree675c22116cc5af11a76f39c775820334c0cd1d74 /anaconda
parentb3cfc187ab5cea266398182d6cdb09d62483f060 (diff)
downloadanaconda-b6a080fabaae89969be6e0d5cee0bde45143f8de.tar.gz
anaconda-b6a080fabaae89969be6e0d5cee0bde45143f8de.tar.xz
anaconda-b6a080fabaae89969be6e0d5cee0bde45143f8de.zip
When there is text mode specified in the kickstart file, disable the vnc question (#455612)
Diffstat (limited to 'anaconda')
-rwxr-xr-xanaconda6
1 files changed, 5 insertions, 1 deletions
diff --git a/anaconda b/anaconda
index e713713d4..7a8a70c63 100755
--- a/anaconda
+++ b/anaconda
@@ -319,6 +319,10 @@ def setVNCFromKickstart(opts):
if vncS.vncconnectport == "":
vncS.vncconnectport = handler.vnc.port
+ from pykickstart.constants import DISPLAY_MODE_GRAPHICAL
+ if handler.displaymode.displayMode!=DISPLAY_MODE_GRAPHICAL and handler.displaymode.displayMode!=None:
+ flags.vncquestion = False
+
return handler.vnc
def setupPythonPath():
@@ -775,7 +779,7 @@ if __name__ == "__main__":
else:
opts.display_mode = 'g'
- if opts.display_mode == 't': #we prefer vnc over text mode, so ask about that
+ if opts.display_mode == 't' and flags.vncquestion: #we prefer vnc over text mode, so ask about that
title = _("Would you like to use VNC?")
message = _("The VNC mode installation offers more functionality than the text mode, would you like to use it instead?")