fix startx bootoption

diff --git a/autoconfig.functions b/autoconfig.functions
index 867650c..f6d99b3 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Sam Feb 17 13:59:43 CET 2007 [mika]
+# Latest change: Mon Feb 19 18:59:09 CET 2007 [mika]

 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh


@@ -1626,11 +1626,8 @@ sudo -u $fstabuser -i /usr/bin/grml-x $WINDOWMANAGER 1>>$DEBUG
 EOF
    chmod 755 /etc/init.d/xstartup
 
 EOF
    chmod 755 /etc/init.d/xstartup
 

-   if grep -q xstartup /etc/inittab ; then
-        sed -i 's#^6.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#'   /etc/inittab
-   else
-        echo '6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"' >> /etc/inittab
-   fi
+   sed -i 's#^6:.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#' /etc/inittab
+   

    /sbin/telinit q ; eend $?
 
    if grep -q '^allowed_users=' /etc/X11/Xwrapper.config ; then
    /sbin/telinit q ; eend $?
 
    if grep -q '^allowed_users=' /etc/X11/Xwrapper.config ; then

diff --git a/debian/changelog b/debian/changelog
index 5d4b53b..0de4240 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.6.15) unstable; urgency=low
+
+  * Fix startx bootoption. (Thanks for reporting, wuehlmaus.)
+
+ -- Michael Prokop <mika@grml.org>  Mon, 19 Feb 2007 18:59:13 +0100
+

 grml-autoconfig (0.6.14) unstable; urgency=low
 
   * config_language(): activate unicode console if running
 grml-autoconfig (0.6.14) unstable; urgency=low
 
   * config_language(): activate unicode console if running