2008-06-04 Ján ONDREJ <ondrejj@salstar.sk> (via ondrejj@fedoraproject.org)

  * po/sk.po: Typo fix.

1 files changed, 2 insertions, 16 deletions

diff --git a/instdata.py b/instdata.py
index 1ae678855..4b22e8a9e 100644
--- a/instdata.py
+++ b/instdata.py
@@ -38,7 +38,6 @@ import zfcp
 import urllib
 import iutil
 import users
-import rhpl
 import shlex
 from flags import *
 from constants import *
@@ -85,7 +84,7 @@ class InstallData:
         self.rootParts = None
         self.upgradeSwapInfo = None
 
-        if rhpl.getArch() == "s390" or self.anaconda.isKickstart:
+        if iutil.isS390() or self.anaconda.isKickstart:
             self.firstboot = FIRSTBOOT_SKIP
         else:
             self.firstboot = FIRSTBOOT_DEFAULT
@@ -116,18 +115,6 @@ class InstallData:
     def setKeyboard(self, keyboard):
         self.keyboard = keyboard
 
-    # expects a VideoCardInfo object
-    def setVideoCard(self, video):
-        self.videocard = video
-
-    # expects a Monitor object
-    def setMonitor(self, monitor):
-        self.monitor = monitor
-
-    # expects an XSetup object
-    def setXSetup(self, xsetup):
-        self.xsetup = xsetup
-
     # expects 0/1
     def setHeadless(self, isHeadless):
         self.isHeadless = isHeadless
@@ -183,6 +170,7 @@ class InstallData:
         self.network.write (self.anaconda.rootPath)
         self.firewall.write (self.anaconda.rootPath)
         self.security.write (self.anaconda.rootPath)
+        self.desktop.write(self.anaconda.rootPath)
 
         self.users = users.Users()
 
@@ -245,7 +233,6 @@ class InstallData:
 	self.instLanguage.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)
 
@@ -298,7 +285,6 @@ class InstallData:
 
         self.monitor = None
         self.videocard = None
-        self.xsetup = None
         self.isHeadless = 0
 	self.extraModules = extraModules
 	self.fsset = fsset.FileSystemSet()