X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=e0c6cc572695faf455b649bb37f4943d70a55c88;hp=5e0c39e498a642fd259149f7eaf8ba0e8d14d00b;hb=8c0c2938f3f2fd50eae0bd14602036c3194a6e96;hpb=a8499da7a5d9d61c0c818c567f90e4782d8bc2dd

diff --git a/autoconfig.functions b/autoconfig.functions
index 5e0c39e..e0c6cc5 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: Mon Feb 05 12:37:33 CET 2007 [mika]
+# Latest change: Mon Feb 19 18:59:09 CET 2007 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -280,22 +280,27 @@ config_language(){
      einfo "Running consolechars using ${CONSOLEFONT}"
      consolechars -f $CONSOLEFONT || consolechars -d
      eend $?
-
-#     if [ -n "$UTF8" ] ; then
-#        einfo "Notice: run 'filterm - dynafont' in your shell to enable a unicode capable console."
-#     fi
   fi
 
   # we have to set up all consoles, therefore loop it over all ttys:
   if [ -n "$CHARMAP" ] ; then
-   einfo "Running consolechars for ${CHARMAP}"
-   NUM_CONSOLES=`fgconsole --next-available`
-   NUM_CONSOLES=`expr ${NUM_CONSOLES} - 1`
-   [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6
-   for vc in `seq 0 ${NUM_CONSOLES}`  ; do
-     consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$?
-   done
-   eend ${RC}
+     einfo "Running consolechars for ${CHARMAP}"
+     NUM_CONSOLES=`fgconsole --next-available`
+     NUM_CONSOLES=`expr ${NUM_CONSOLES} - 1`
+     [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6
+     for vc in `seq 0 ${NUM_CONSOLES}`  ; do
+       consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$?
+     done
+     eend ${RC}
+  fi
+
+  # activate unicode console if running within utf8 environment
+  if [ -r /etc/default/locale ] ; then
+     if grep -q "LANG=.*UTF" /etc/default/locale ; then
+        einfo "Setting up unicode environment."
+        unicode_start
+        eend $?
+     fi
   fi
 
  eoutdent
@@ -1282,6 +1287,7 @@ fi
 
 # {{{ Check for persistent homedir option and eventually mount /home from there, or use a loopback file.
 config_homedir(){
+if checkbootparam home ; then
 HOMEDIR="$(getbootparam home)"
 MYHOMEDEVICE=""
 MYHOMEMOUNTPOINT=""
@@ -1355,6 +1361,7 @@ $(cat /proc/mounts)
 EOT
   fi
 fi
+fi # checkbootparam home
 }
 # }}}
 
@@ -1621,11 +1628,8 @@ sudo -u $fstabuser -i /usr/bin/grml-x $WINDOWMANAGER 1>>$DEBUG
 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
@@ -1954,7 +1958,7 @@ config_swraid(){
           ewarn "/etc/mdadm/mdadm.conf looks like a configured mdadm setup, will not touch it." ; eend 0
        fi
 
-       if ! checkbootparam 'swraid' ; then 
+       if ! checkbootparam 'swraid' ; then
           eindent
           einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using 'swraid' as bootoption for autostart."
           eoutdent