[master] Disable the VNC question if a user specifies text mode on the cmdline. (#1169368)

[Samantha N. Bueno]

Thanks to Menanteau Guy  for the patch.
---
 anaconda | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/anaconda b/anaconda
index 4ded503..3539b52 100755
--- a/anaconda
+++ b/anaconda
@@ -568,6 +568,11 @@ def setupDisplay(anaconda, options, addons=None):
             flags.usevnc = False
             flags.vncquestion = False

+    # disable VNC question if text mode is requested in the command line (anaconda inst.text option)
+    if anaconda.displayMode == 't':
+        stdoutLog.warning("Not asking for VNC because text mode was explicitly asked for in command line")
+        flags.vncquestion = False
+
     # disable VNC over text question when not enough memory is available
     if blivet.util.total_memory() < isys.MIN_GUI_RAM:
         stdoutLog.warning("Not asking for VNC because current memory (%d) < MIN_GUI_RAM (%d)", blivet.util.total_memory(), isys.MIN_GUI_RAM)

[Vratislav Podzimek]

On Wed, 2015-01-07 at 09:52 -0500, Samantha N. Bueno wrote:
> Thanks to Menanteau Guy  for the patch.
>
> anaconda | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/anaconda b/anaconda
> index 4ded503..3539b52 100755
> --- a/anaconda
> +++ b/anaconda
> @@ -568,6 +568,11 @@ def setupDisplay(anaconda, options, addons=None):
>              flags.usevnc = False
>              flags.vncquestion = False
> # disable VNC question if text mode is requested in the command line (anaconda inst.text option)
> if anaconda.displayMode == 't':
>    stdoutLog.warning("Not asking for VNC because text mode was explicitly asked for in command line")

'on command line' sounds better to me.

I'd swear we already have a piece of code like this.

[Samantha N. Bueno]

On Wed, Jan 07, 2015 at 04:08:01PM +0100, Vratislav Podzimek wrote:
> On Wed, 2015-01-07 at 09:52 -0500, Samantha N. Bueno wrote:
> > Thanks to Menanteau Guy  for the patch.
> >
> > anaconda | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/anaconda b/anaconda
> > index 4ded503..3539b52 100755
> > --- a/anaconda
> > +++ b/anaconda
> > @@ -568,6 +568,11 @@ def setupDisplay(anaconda, options, addons=None):
> >              flags.usevnc = False
> >              flags.vncquestion = False
> > # disable VNC question if text mode is requested in the command line (anaconda inst.text option)
> > if anaconda.displayMode == 't':
> >    stdoutLog.warning("Not asking for VNC because text mode was explicitly asked for in command line")
>
> 'on command line' sounds better to me.

Yeah, 'on the commad line'. I'll fix it.
> I'd swear we already have a piece of code like this.

Believe it or not, no. We only disable the vnc question if you specify
text mode in kickstart.

Samantha

[Samantha N. Bueno]

Re-sending since (at least to me) I never got a sense of an Ack one way
or the other.

(And the wording vpodzime suggested re: in/on command line was fixed
locally)

On Wed, Jan 07, 2015 at 09:52:27AM -0500, Samantha N. Bueno wrote:
> Thanks to Menanteau Guy  for the patch.
>
> anaconda | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/anaconda b/anaconda
> index 4ded503..3539b52 100755
> --- a/anaconda
> +++ b/anaconda
> @@ -568,6 +568,11 @@ def setupDisplay(anaconda, options, addons=None):
>              flags.usevnc = False
>              flags.vncquestion = False
> # disable VNC question if text mode is requested in the command line (anaconda inst.text option)
> if anaconda.displayMode == 't':
>    stdoutLog.warning("Not asking for VNC because text mode was explicitly asked for in command line")
>    flags.vncquestion = False
> # disable VNC over text question when not enough memory is available
>    if blivet.util.total_memory() < isys.MIN_GUI_RAM:
>        stdoutLog.warning("Not asking for VNC because current memory (%d) < MIN_GUI_RAM (%d)", blivet.util.total_memory(), isys.MIN_GUI_RAM)
>
> -- 
> 1.8.3.1
>
> anaconda-patches mailing list
> [e-mail]
> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches

[Anne Mulhern]

----- Original Message -----
> From: "Samantha N. Bueno" 
> To: "anaconda patch review" 
> Sent: Tuesday, January 20, 2015 4:33:35 PM
> Subject: Re: [master] Disable the VNC question if a user specifies text mode	on the cmdline. (#1169368)
>
> Re-sending since (at least to me) I never got a sense of an Ack one way
> or the other.
>
> (And the wording vpodzime suggested re: in/on command line was fixed
> locally)
>
> On Wed, Jan 07, 2015 at 09:52:27AM -0500, Samantha N. Bueno wrote:
> > Thanks to Menanteau Guy  for the patch.
> >
> > anaconda | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/anaconda b/anaconda
> > index 4ded503..3539b52 100755
> > --- a/anaconda
> > +++ b/anaconda
> > @@ -568,6 +568,11 @@ def setupDisplay(anaconda, options, addons=None):
> >              flags.usevnc = False
> >              flags.vncquestion = False
> > # disable VNC question if text mode is requested in the command line
> >
> > (anaconda inst.text option)
> > if anaconda.displayMode == 't':
> >    stdoutLog.warning("Not asking for VNC because text mode was
> >
> > explicitly asked for in command line")
> >    flags.vncquestion = False

This patch makes the chunk of code that starts with comment:

# disable VNC question if text mode is requested and this is a ks install

completely redundant.
> >  # disable VNC over text question when not enough memory is available
> >  if blivet.util.total_memory() < isys.MIN_GUI_RAM:
> >      stdoutLog.warning("Not asking for VNC because current memory (%d)
> >      < MIN_GUI_RAM (%d)", blivet.util.total_memory(),
> >      isys.MIN_GUI_RAM)
> >
> > --
> > 1.8.3.1
> >
> > anaconda-patches mailing list
> > [e-mail]
> > https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
>
> anaconda-patches mailing list
> [e-mail]
> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches

- mulhern