From 975698c289322e14b730adaae36a907b30fc251e Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 4 Mar 2010 01:01:17 +0100
Subject: [PATCH] Improve way how we start X via bootoption startx.

---
 autoconfig.functions | 9 ++++-----
 debian/changelog     | 6 ++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/autoconfig.functions b/autoconfig.functions
index 73cc32e..c0c1111 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1836,20 +1836,19 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t
    else
      einfo "Window manager ${WHITE}${WINDOWMANAGER}${NORMAL} found as bootoption." && eend 0
    fi
-   einfo "Changing to runlevel 5 for starting grml-x ${WINDOWMANAGER}. Just exit X windows system to get full featured consoles."
+   einfo "Setting up and invoking grml-x ${WINDOWMANAGER}. Just exit X windows system to get full featured consoles."
    config_userfstab || fstabuser='grml'
  cat>|/etc/init.d/xstartup<<EOF
 #!/bin/sh
-# su - $fstabuser -c 'grml-x "$WINDOWMANAGER"'
-sudo -u $fstabuser -i /usr/bin/grml-x $WINDOWMANAGER >>$DEBUG
+su $fstabuser -c "/usr/bin/grml-x $WINDOWMANAGER"
 EOF
    chmod 755 /etc/init.d/xstartup
 
    # adjust inittab for xstartup
    if grep -q '^6:' /etc/inittab ; then
-      sed -i 's|^6:.*|6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"|' /etc/inittab
+      sed -i 's|^6:.*|6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /usr/bin/zsh-login" >/dev/tty6 2>\&1 </dev/tty6|' /etc/inittab
    else # just append tty6 to inittab if no definition is present:
-      echo '6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"' >> /etc/inittab
+      echo '6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /usr/bin/zsh-login" >/dev/tty6 2>&1 < /dev/tty6' >> /etc/inittab
    fi
 
    /sbin/telinit q ; eend $?
diff --git a/debian/changelog b/debian/changelog
index 44fb872..1651749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.9.9) unstable; urgency=low
+
+  * Improve way how we start X via bootoption startx.
+
+ -- Michael Prokop <mika@grml.org>  Thu, 04 Mar 2010 01:00:44 +0100
+
 grml-autoconfig (0.9.8) unstable; urgency=low
 
   * save-config: search for modified files and symlinks in /etc
-- 
2.1.4