fix 'text' or 'cmdline' in kickstart (#814108)
On Thu, Apr 19, 2012 at 04:10:17PM -0400, Will Woods wrote:
> Anaconda was assuming that loader would handle the 'text', 'cmdline',
> and 'graphical' kickstart commands, so it didn't bother looking at them.
> So lazy! Use the anaconda.ksdata to override opts.display_mode.
> ---
> anaconda | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/anaconda b/anaconda
> index 0a214dc..5911618 100755
> --- a/anaconda
> +++ b/anaconda
> @@ -793,6 +793,15 @@ if __name__ == "__main__":
> if anaconda.ksdata.clearpart.initAll:
> anaconda.storage.config.reinitializeDisks = anaconda.ksdata.clearpart.initAll
>
> + # Set up display options.
> + # NOTE: kickstart overrides cmdline, because kickstart gets parsed last
> + if anaconda.ksdata.displaymode.displayMode is not None:
> + # this is derived from pykickstart.constants.DISPLAY_MODE_*
> + displaymap = ['cmdline', 'graphical', 'text']
> + display_mode = displaymap[anaconda.ksdata.displaymode.displayMode]
> + log.info("kickstart forcing %s mode" % display_mode)
> + opts.display_mode = display_mode[0] # 'c', 'g', or 't'
> +
> # now start the interface
> setupDisplay(anaconda, opts)
> # setting the install steps requires interface to be running
> --
> 1.7.7.6
Ack
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
|
