merge taroon branch up until now. tagged as before-taroon-merge before and

will be tagged after-taroon-merge after.  taroon at this point is tagged
taroon-merge-point for where to base merges from in the future

1 files changed, 6 insertions, 0 deletions

diff --git a/xsetup.py b/xsetup.py
index bd934b9bf..b4623c5f1 100644
--- a/xsetup.py
+++ b/xsetup.py
@@ -16,6 +16,7 @@
 #
 # should probably go in rhpl
 #
+import iutil
 import rhpl.xserver as xserver
 from rhpl.translate import _
 
@@ -62,6 +63,11 @@ class XSetup:
 	self.xhwstate.set_monitor_name(monname)
 
     def writeKS(self, f, desktop=None):
+        # FIXME: we really should have at least teh startxonboot and
+        # defaultdesktop bits on s390
+        if iutil.getArch() == "s390":
+            return
+        
 	if self.skipx:
 	    f.write("skipx\n")
 	    return