X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=a413a4048b86ac7cc935a746e4bbe4768531062c;hb=dff496980bcc1f22278029ed040a89b4aa8a09e3;hp=33646d71c1873f7ed051a5e6f75fea496f84d012;hpb=f9b8a344c4f45000a63b3288ea2cfff1b7508c1c;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 33646d7..a413a40 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: Fri Dec 28 23:14:32 CET 2007 [mika]
+# Latest change: Mon Aug 25 15:07:12 CEST 2008 [mika]
 ################################################################################
 
 set -u
@@ -12,11 +12,13 @@ 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/vim.tiny ] ; then
-   $ROOTCMD update-alternatives --set vi /usr/bin/vim.tiny
-fi
+## 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/uxterm ] ; then
    $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/uxterm