On Mon, Oct 01, 2012 at 09:23:35AM -0700, Jesse Keating wrote:
On 09/28/2012 04:05 PM, Brian C. Lane wrote:
On Fri, Sep 28, 2012 at 12:17:42PM -0700, Jesse Keating wrote:
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 = FalseWhat about DISPLAY_MODE_CMDLINE? If cmdline is specified it shouldn't ask either.
We only ask about VNC is display mode is t and the askvnc is set, OR if display mode is X but X startup failed. This precludes asking for VNC if display mode is c.
Thanks for the clarification, ACK to this set then.