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

Jesse Keating jkeating at redhat.com
Mon Oct 1 16:23:35 UTC 2012


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 = False
>> +
>
> What 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.


-- 
Jesse Keating
Fedora -- FreedomĀ² is a feature!


More information about the anaconda-patches mailing list