X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=b180e4d1a6e3f62631e6a77fa1286745061ba75d;hb=366d980fd1f076fe0730a5185767e92631cf79c0;hp=968c62d9fbc48891f935b6f9d44ce8479a351da1;hpb=56f884ea6af2e5c5e8a15b33967086fc29e849ec;p=grml-x.git

diff --git a/grml-x b/grml-x
index 968c62d..b180e4d 100755
--- a/grml-x
+++ b/grml-x
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 # vim: set et ts=4:
 
@@ -9,8 +9,6 @@
 # License:       This file is licensed under the GPL v2.
 ###############################################################################
 
-# Requires python 2.6 or, possibly, a newer version of python 2.X.
-
 import fileinput, os, subprocess, sys, tempfile, time, traceback
 from optparse import OptionParser
 
@@ -26,7 +24,7 @@ class Section(object):
             v = self.data[k]
             if isinstance(v, list):
                 v = '" "'.join(v)
-            elif not isinstance(v, basestring): # int, others
+            elif not isinstance(v, str): # int, others
                 v = str(v)
             elif '-' in v: # sync range
                 pass
@@ -65,12 +63,12 @@ def build_bootparams():
                     lines.extend(f.readlines())
                     f.close()
         except:
-            print 'W: Error while getting bootparams from %s' % p
+            print('W: Error while getting bootparams from %s' % p)
     f = open('/proc/cmdline')
     lines.append(f.readline())
     f.close()
-    walk_bootparams_path('/cdrom/bootparams')
-    walk_bootparams_path('/live/image/bootparams')
+    walk_bootparams_path('/lib/live/mount/medium/bootparams')
+    walk_bootparams_path('/run/live/medium/bootparams')
     params = {}
     for p in ' '.join(lines).split(' '):
         if '=' in p:
@@ -147,12 +145,12 @@ def main():
     bootparams = build_bootparams()
 
     if os.getuid() == 0 and options.start_server:
-        print "W: running as root is unsupported and may not work."
+        print("W: running as root is unsupported and may not work.")
         time.sleep(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"
+        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']
@@ -183,7 +181,7 @@ def main():
     if len(args) == 1: window_manager = args[0]
     window_manager_path = which(window_manager)
     if not window_manager_path:
-        print "E: Cannot find window manager %r, aborting." % window_manager
+        print("E: Cannot find window manager %r, aborting." % window_manager)
         return 2
 
     wm_exec = "exec %s\n" % window_manager_path
@@ -200,7 +198,7 @@ def main():
         for line in lines:
             if line.strip().startswith('exec '): line = wm_exec
             f.write(line)
-        os.fchmod(f.fileno(), 0750)
+        os.fchmod(f.fileno(), 0o750)
         f.close()
 
     # write new config
@@ -214,7 +212,7 @@ def main():
             if device: f.write(str(device))
             f.write(str(screen))
             f.flush()
-            os.fchmod(f.fileno(), 0644)
+            os.fchmod(f.fileno(), 0o644)
             run_program(['sudo', 'mv', '-f', f.name, options.xorg_conf])
         finally:
             f.close()
@@ -222,7 +220,7 @@ def main():
     if options.start_server:
         startx = ['startx', xinitrc, '--']
         if options.display: startx.append(':' + options.display)
-        print "Starting X: %r" % startx
+        print("Starting X: %r" % startx)
         run_program(startx)
 
     return 0
@@ -232,7 +230,7 @@ if __name__ == '__main__':
     try:
         rc = main()
     except Exception:
-        print "E: Exception: ",
+        print("E: Exception: ", end=' ')
         traceback.print_exc()
     sys.exit(1)