X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=89c853b71ee12be13702d5366751b860f2f6d806;hb=c49d25365ebcb71391432ca77b27e642ae4681d5;hp=270f8b6d9a3fc5b37a766271cce2e1a5529cf26d;hpb=ca524b81c38db922d8e3ea2c5f233b436166a753;p=grml-x.git

diff --git a/grml-x b/grml-x
index 270f8b6..89c853b 100755
--- a/grml-x
+++ b/grml-x
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 # vim: set et ts=4:
 
@@ -69,8 +69,8 @@ def build_bootparams():
     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:
@@ -198,7 +198,7 @@ def main():
         f.close()
         f = open(xinitrc, 'w')
         for line in lines:
-            if line.startswith('exec '): line = wm_exec
+            if line.strip().startswith('exec '): line = wm_exec
             f.write(line)
         os.fchmod(f.fileno(), 0750)
         f.close()