Fix writing out --startxonboot and the initial setting of firstboot in case

no firstboot command line is found.

1 files changed, 9 insertions, 4 deletions

diff --git a/xsetup.py b/xsetup.py
index 0fec1a81b..0d184273f 100644
--- a/xsetup.py
+++ b/xsetup.py
@@ -51,12 +51,17 @@ class XSetup:
         # We don't want anything else on s390.
         if rhpl.getArch() == "s390" and args != []:
             f.write("xconfig %s\n" % string.join(args, " "))
+            return
 
         if ksconfig:
-            s = ksconfig.xconfig.__str__().rstrip() + string.join(args, " ")
-            f.write(s + "\n")
+            s = ksconfig.xconfig.__str__().rstrip()
+            f.write(s)
+
+            for arg in args:
+                if s.find(arg) == -1:
+                    f.write(" %s" % arg)
 
-            s = ksconfig.monitor.__str__().rstrip() + string.join(args, " ")
-            f.write(s + "\n")
+            f.write("\n")
+            f.write(ksconfig.monitor.__str__())
         elif args != []:
             f.write("xconfig %s\n" % string.join(args, " "))