defer writing inittab rl default and desktop until after we config X - write it at the same time we write the X config. Fixed writing of /etc/sysconfig/desktop

3 files changed, 17 insertions, 10 deletions

diff --git a/desktop.py b/desktop.py
index fb5734ee6..6d423f22b 100644
--- a/desktop.py
+++ b/desktop.py
@@ -14,29 +14,30 @@
 #
 
 import string
+from simpleconfig import SimpleConfigFile
 from log import log
 
-class Desktop:
+class Desktop (SimpleConfigFile):
 #
 # This class represents the default desktop to run and the default runlevel
 # to start in
 #
-    def setDefaultDesktop(self, desktop):
-        self.desktop = desktop
-
     def setDefaultRunLevel(self, runlevel):
         if str(runlevel) != "3" and str(runlevel) != "5":
             raise RuntimeError, "Desktop::setDefaultRunLevel() - Must specify runlevel as 3 or 5!"
         self.runlevel = runlevel
 
-    def getDefaultDesktop(self):
-        return self.desktop
-
     def getDefaultRunLevel(self):
         return self.runlevel
 
+    def setDefaultDesktop(self, desktop):
+        self.info["DESKTOP"] = desktop
+
+    def getDefaultDesktop(self):
+        return self.get("DESKTOP")
+
     def __init__ (self):
-        self.desktop = None
+        SimpleConfigFile.__init__ (self)
         self.runlevel = 3
 
     def write (self, instPath):
@@ -55,3 +56,9 @@ class Desktop:
                 line = string.join (fields, ':')
             inittab.write (line)
         inittab.close ()
+
+	f = open(instPath + "/etc/sysconfig/desktop", "w")
+	f.write(str (self))
+	f.close()
+
+
diff --git a/instdata.py b/instdata.py
index 9df3f0e44..37bcd0b2b 100644
--- a/instdata.py
+++ b/instdata.py
@@ -104,7 +104,6 @@ class InstallData:
 	self.firewall.write (instPath)
         self.rootPassword.write (instPath, self.auth)
         self.accounts.write (instPath, self.auth)
-        self.desktop.write (instPath)
         self.fsset.write (instPath)
 
     def writeKS(self, filename):
diff --git a/packages.py b/packages.py
index 7e1db8944..be150ba8d 100644
--- a/packages.py
+++ b/packages.py
@@ -44,7 +44,7 @@ def queryUpgradeContinue(intf, dir):
 def writeConfiguration(id, instPath):
     log("Writing main configuration")
     if not flags.test:
-	id.write(instPath)
+        id.write(instPath)
 
 def writeKSConfiguration(id, instPath):
     log("Writing autokickstart file")
@@ -79,6 +79,7 @@ def writeXConfiguration(id, instPath):
         fn = "/tmp/"
 
     id.xconfig.write(fn+"/etc/X11")
+    id.desktop.write(instpath)
 
 def readPackages(intf, method, id):
     if (not id.hdList):