anaconda/sme8/0011-Make-install-headless-but-still-write-keyboard-info-.patch

From 8eff0a88b3a600e16b4743811d2d61df6b14ae75 Mon Sep 17 00:00:00 2001
From: Shad L. Lords <slords@mail.com>
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

1	From 8eff0a88b3a600e16b4743811d2d61df6b14ae75 Mon Sep 17 00:00:00 2001
2	From: Shad L. Lords <slords@mail.com>
3	Date: Mon, 19 Oct 2009 08:34:43 -0600
4	Subject: [PATCH 11/17] Make install headless but still write keyboard info out
5
6	---
7	anaconda \| 6 ++++++
8	instdata.py \| 5 ++---
9	2 files changed, 8 insertions(+), 3 deletions(-)
10
11	diff --git a/anaconda b/anaconda
12	index 9c77191..2ce84cc 100755
13	--- a/anaconda
14	+++ b/anaconda
15	@@ -757,6 +757,9 @@ if __name__ == "__main__":
16	else:
17	opts.display_mode = 'g'
18
19	+ # we don't want to ask about vnc
20	+ flags.vncquestion = False
21	+
22	#we prefer vnc over text mode, so ask about that, but only if the KS file doesn't specify anything special
23	if opts.display_mode == 't' and flags.vncquestion:
24	title = _("Would you like to use VNC?")
25	@@ -777,6 +780,9 @@ if __name__ == "__main__":
26	import instdata
27	import floppy
28
29	+ # we don't want to waste time probing
30	+ opts.isHeadless = 1
31	+
32	if not opts.isHeadless:
33	try:
34	import xsetup
35	diff --git a/instdata.py b/instdata.py
36	index f6903f3..e747f09 100644
37	--- a/instdata.py
38	+++ b/instdata.py
39	@@ -145,8 +145,7 @@ class InstallData:
40	def write(self):
41	self.instLanguage.write (self.anaconda.rootPath)
42
43	- if not self.isHeadless:
44	- self.keyboard.write (self.anaconda.rootPath)
45	+ self.keyboard.write (self.anaconda.rootPath)
46
47	self.timezone.write (self.anaconda.rootPath)
48
49	@@ -264,8 +263,8 @@ class InstallData:
50	f.write("key %s\n" %(self.instClass.installkey,))
51
52	self.instLanguage.writeKS(f)
53	+ self.keyboard.writeKS(f)
54	if not self.isHeadless:
55	- self.keyboard.writeKS(f)
56	self.xsetup.writeKS(f, self.desktop, self.ksdata)
57	self.network.writeKS(f)
58	self.zfcp.writeKS(f)
59	--
60	1.7.1
61