From 8eff0a88b3a600e16b4743811d2d61df6b14ae75 Mon Sep 17 00:00:00 2001 From: Shad L. Lords Date: Mon, 19 Oct 2009 08:34:43 -0600 Subject: [PATCH 11/17] Make install headless but still write keyboard info out --- anaconda | 6 ++++++ instdata.py | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/anaconda b/anaconda index 9c77191..2ce84cc 100755 --- a/anaconda +++ b/anaconda @@ -757,6 +757,9 @@ if __name__ == "__main__": else: opts.display_mode = 'g' + # we don't want to ask about vnc + flags.vncquestion = False + #we prefer vnc over text mode, so ask about that, but only if the KS file doesn't specify anything special if opts.display_mode == 't' and flags.vncquestion: title = _("Would you like to use VNC?") @@ -777,6 +780,9 @@ if __name__ == "__main__": import instdata import floppy + # we don't want to waste time probing + opts.isHeadless = 1 + if not opts.isHeadless: try: import xsetup diff --git a/instdata.py b/instdata.py index f6903f3..e747f09 100644 --- a/instdata.py +++ b/instdata.py @@ -145,8 +145,7 @@ class InstallData: def write(self): self.instLanguage.write (self.anaconda.rootPath) - if not self.isHeadless: - self.keyboard.write (self.anaconda.rootPath) + self.keyboard.write (self.anaconda.rootPath) self.timezone.write (self.anaconda.rootPath) @@ -264,8 +263,8 @@ class InstallData: f.write("key %s\n" %(self.instClass.installkey,)) self.instLanguage.writeKS(f) + self.keyboard.writeKS(f) if not self.isHeadless: - self.keyboard.writeKS(f) self.xsetup.writeKS(f, self.desktop, self.ksdata) self.network.writeKS(f) self.zfcp.writeKS(f) -- 1.7.1