From: Michael Prokop <mika@grml.org>
Date: Sun, 15 Apr 2007 11:15:24 +0000 (+0200)
Subject: Make sure tty6 is defined in /etc/inittab for xstartup
X-Git-Tag: 0.6.35
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=b6bdf6d754ebe00b9e3472f1a3e9668d7538ae42

Make sure tty6 is defined in /etc/inittab for xstartup
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 81edf60..e21481d 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1656,7 +1656,14 @@ sudo -u $fstabuser -i /usr/bin/grml-x $WINDOWMANAGER 1>>$DEBUG
 EOF
    chmod 755 /etc/init.d/xstartup
 
-   sed -i 's#^6:.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#' /etc/inittab
+   # 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
+   elif grep -q '^# 6' /etc/inittab ; then # no tty6? assume customized grml-small:
+      sed -i 's#^6:.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#' /etc/inittab
+   else # just append tty6 to inittab if it isn't present at all
+      echo '6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"' >> /etc/inittab
+   fi
 
    /sbin/telinit q ; eend $?
 
diff --git a/debian/changelog b/debian/changelog
index fbdab89..87f9143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.6.35) unstable; urgency=low
+
+  * Make sure tty6 is defined in /etc/inittab for xstartup, even
+    if it's grml-small.
+
+ -- Michael Prokop <mika@grml.org>  Sun, 15 Apr 2007 13:14:41 +0200
+
 grml-autoconfig (0.6.34) unstable; urgency=low
 
   * Code rewrite of config_fstab(), this should fix the '/home