[PATCH 1/6] Skip VNC prompt if text is requested in kickstart

Jesse Keating jkeating at redhat.com
Fri Sep 28 19:17:42 UTC 2012


---
 anaconda | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/anaconda b/anaconda
index 57f7bb8..0e47714 100755
--- a/anaconda
+++ b/anaconda
@@ -405,6 +405,7 @@ def startDebugger(signum, frame):
 def setupDisplay(anaconda, opts):
     from pyanaconda.ui.tui.simpleline import App
     from pyanaconda.ui.tui.spokes.askvnc import AskVNCSpoke
+    from pykickstart.constants import DISPLAY_MODE_TEXT
 
     graphical_failed = 0
     vncS = vnc.VncServer()          # The vnc Server object.
@@ -455,6 +456,10 @@ def setupDisplay(anaconda, opts):
     if iutil.memInstalled() < isys.MIN_GUI_RAM:
         flags.vncquestion = False
 
+    # disable VNC question if we were explicitly asked for text in kickstart
+    if anaconda.ksdata.displaymode.displayMode == DISPLAY_MODE_TEXT:
+        flags.vncquestion = False
+
     if os.environ.has_key('DISPLAY'):
         flags.preexisting_x11 = True
 
-- 
1.7.11.4



More information about the anaconda-patches mailing list