X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=968c62d9fbc48891f935b6f9d44ce8479a351da1;hb=88d38f7cf5f160b74aa4f3c0863fa8c2c3b3af30;hp=024b41feefaa97356d3a39c29c32f20fa2beee22;hpb=72c7d74dd72fa809befc2c7b111e0b27869d9c20;p=grml-x.git diff --git a/grml-x b/grml-x index 024b41f..968c62d 100755 --- a/grml-x +++ b/grml-x @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python # -*- coding: utf-8 -*- # vim: set et ts=4: @@ -9,6 +9,8 @@ # 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 @@ -72,7 +74,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 @@ -196,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()