Fix tty6-check, thanks for the code review - Matthias Lederhofer!

diff --git a/autoconfig.functions b/autoconfig.functions
index e21481d..cf78d9d 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1657,11 +1657,9 @@ 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
-   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
+   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
+   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
    fi
 

diff --git a/debian/changelog b/debian/changelog
index 87f9143..494a018 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.6.36) unstable; urgency=low
+
+  * Fix tty6-check, thanks for the code review - Matthias Lederhofer!
+
+ -- Michael Prokop <mika@grml.org>  Sun, 15 Apr 2007 13:24:45 +0200
+
 grml-autoconfig (0.6.35) unstable; urgency=low
 
   * Make sure tty6 is defined in /etc/inittab for xstartup, even