X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=ac45baf1a42c9f81ea89f1fc2ae45d7cd245ba07;hb=d9cf14645fa29b87c5b19a8a20bd8b465454827e;hp=91a608f2301ebd4fd12c6c2c7dfa353cc3ba85e4;hpb=5e15575ecc8def9071b2aeae3c201db5d8e622e4;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 91a608f..ac45baf 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -4,14 +4,30 @@
 # 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: Mon Oct 15 18:57:56 CEST 2007 [mika]
+# Latest change: Mon Sep 29 13:58:14 CEST 2008 [mika]
 ################################################################################
 
 set -u
 set -e
 
+## Editor:
+# Too many people don't expect to get that, so use it only for grml-small:
+# avoid "debug: unbound variable"
+set +u
+if ifclass GRML_SMALL ; then
+set -u
+   if [ -r $target/usr/bin/vim.tiny ] ; then
+      # $ROOTCMD update-alternatives --set editor /usr/bin/vim.tiny
+      $ROOTCMD update-alternatives --set vi     /usr/bin/vim.tiny
+   fi
+else
+   # avoid "debug: unbound variable" for ifclass running with 'set -u'
+   true
+fi
+
 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/uxterm ] ; then