X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=e21481d61dc3e8e33d261c9a10ac8dfd4e601762;hp=ae4edd76336ad3dbd380fa21454a9f24cdca24a6;hb=b6bdf6d754ebe00b9e3472f1a3e9668d7538ae42;hpb=180b35a6adcd6c76bce96d6eb1b0935c43106c13

diff --git a/autoconfig.functions b/autoconfig.functions
index ae4edd7..e21481d 100755
--- 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.
-# Latest change: Fre Apr 13 12:49:52 CEST 2007 [mika]
+# Latest change: Son Apr 15 12:20:14 CEST 2007 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -277,7 +277,7 @@ config_language(){
           ewarn "Not runnning unicode_start: grml-small with reduced language support detected." ; eend 0
        else
           einfo "Setting up unicode environment."
-          unicode_start ; eend $?
+          unicode_start 2>>$DEBUG ; eend $?
        fi
     fi
  fi
@@ -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 $?