X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=5e325e1ca2b0193d304e0496c7711957092c03be;hb=25953d430c25969726d1fe1a635536fbec4e0a7c;hp=6874c92569f8d8b3b7b450f7f648b38c29562f08;hpb=4cd22cb86e94c6bb4731d0fb876d7c5637037d22;p=grml-x.git

diff --git a/grml-x b/grml-x
index 6874c92..5e325e1 100755
--- a/grml-x
+++ b/grml-x
@@ -24,6 +24,8 @@ class Section(object):
             v = self.data[k]
             if isinstance(v, list):
                 v = '" "'.join(v)
+            elif not isinstance(v, basestring): # int, others
+                v = str(v)
             elif '-' in v: # sync range
                 pass
             else:
@@ -70,7 +72,7 @@ def build_bootparams():
     params = {}
     for p in ' '.join(lines).split(' '):
         if '=' in p:
-            (k,v) = p.split('=', 2)
+            (k,v) = p.split('=', 1)
             params[k] = v
         else:
             params[p] = True
@@ -106,6 +108,20 @@ def which(program):
 
     return None
 
+XORG_CONF_HEADER = "# Automatically generated by grml-x."
+def check_old_xorg_conf(filename, overwrite):
+    # True: no problem, we can create/overwrite the config file
+    # False: pre-existing config file, and we are not to overwrite it
+    if overwrite: return True
+    if not os.path.exists(filename): return True
+    try:
+        f = file(filename, 'r')
+        lines = f.readlines()
+        f.close()
+        return (not XORG_CONF_HEADER in lines)
+    except IOError:
+        return False
+
 parser = OptionParser(usage="usage: %prog [options] [window-manager]")
 parser.add_option("--nostart", action="store_false", dest="start_server", default=True,
                 help="Don't start X server")
@@ -128,17 +144,14 @@ def main():
     (options, args) = parser.parse_args()
     bootparams = build_bootparams()
 
-    if os.getuid() == 0:
+    if os.getuid() == 0 and options.start_server:
         print "W: running as root is unsupported and may not work."
         time.sleep(1)
 
-    if os.path.exists(options.xorg_conf):
-        if options.overwrite:
-            os.unlink(options.xorg_conf)
-        else:
-            print "E: Not overwriting existing %r without --force." % options.xorg_conf
-            print "I: If you previously ran grml-x, use startx /usr/bin/x-window-manager"
-            return 1
+    if not check_old_xorg_conf(options.xorg_conf, options.overwrite):
+        print "E: Not overwriting existing %r without --force." % options.xorg_conf
+        print "I: If you previously ran grml-x, use startx /usr/bin/x-window-manager"
+        return 1
 
     if 'xmode' in bootparams and not options.mode: options.mode = bootparams['xmode']
     if 'xmodule' in bootparams and not options.module: options.module = bootparams['xmodule']
@@ -192,12 +205,14 @@ def main():
     if monitor or device or len(screen.data) > 0 or screen.subsect != '':
         try:
             f = tempfile.NamedTemporaryFile(delete=False)
-            f.write('# Automatically generated by grml-x.\n')
-            f.write('# See man xorg.conf or /etc/X11/xorg.conf.example for more\n')
+            f.write(XORG_CONF_HEADER + "\n")
+            f.write("# DO NOT MODIFY, YOUR CHANGES WILL BE LOST - OR REMOVE ALL HEADER LINES\n")
+            f.write("# See man xorg.conf or /etc/X11/xorg.conf.example for more\n")
             if monitor: f.write(str(monitor))
             if device: f.write(str(device))
             f.write(str(screen))
             f.flush()
+            os.fchmod(f.fileno(), 0644)
             run_program(['sudo', 'mv', '-f', f.name, options.xorg_conf])
         finally:
             f.close()