X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=fb0912c8c4ff901d9c388154355bc12fcf165e1c;hb=b94641a1af46ddcf5aa03eafdb89834439768b12;hp=977c5db586f2d7ead76a1f0fb5d1d5fd3d0815c4;hpb=d7ed1ccea58431bdcaf03a36b7150887d5b3ee2c;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index 977c5db..fb0912c 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Sat Oct 06 13:04:13 CEST 2007 [mika]
+# Latest change: Mon Aug 25 13:24:20 CEST 2008 [mika]
 ################################################################################
 
 set -u
@@ -12,9 +12,20 @@ set -e
 
 if [ -r $target/usr/bin/vim.basic ] ; then
    $ROOTCMD update-alternatives --set editor /usr/bin/vim.basic
+   $ROOTCMD update-alternatives --set vi     /usr/bin/vim.basic
 fi
 
-if [ -r $target/usr/bin/xterm ] ; then
+## Too many people don't expect to get that, so deactive by default:
+# if [ -r $target/usr/bin/vim.tiny ] ; then
+#    $ROOTCMD update-alternatives --set vi /usr/bin/vim.tiny
+# fi
+
+if [ -r $target/usr/bin/vim.tiny ] ; then
+fi
+
+if [ -r $target/usr/bin/uxterm ] ; then
+   $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/uxterm
+elif [ -r $target/usr/bin/xterm ] ; then
    $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/xterm
 fi