X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=234e56a979955c14c561152eba16acc713be1b3a;hb=c33cf0dfcbe8ecf156592eb527491f6f44d1befc;hp=d67281f57375aa56840ab735ca73b3b305b88bcd;hpb=c745e7411722e1b63b1f26caf2806e5bddeae2cc;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 d67281f..234e56a 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -4,18 +4,26 @@
 # 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 Sep 29 13:15:35 CEST 2008 [mika]
 ################################################################################
 
 set -u
 set -e
 
 ## Editor:
-# Too many people don't expect to get that, so use it only for grml-small:
+# 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
+      # update-alternates does not work without /usr/share/man because
+      # it configures (in our case non-existent) manpages as well :-/
+      # $ROOTCMD update-alternatives --set editor /usr/bin/vim.tiny
+      # $ROOTCMD update-alternatives --set vi     /usr/bin/vim.tiny
+      $ROOTCMD ln -sf /etc/alternatives/editor /usr/bin/editor
+      $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/editor
+      $ROOTCMD ln -sf /etc/alternatives/vi /usr/bin/vi
+      $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/vi
    fi
 fi
 
@@ -42,5 +50,9 @@ if [ -r $target/usr/bin/w3m ] ; then
    $ROOTCMD update-alternatives --set www-browser /usr/bin/w3m
 fi
 
+if [ -r $target/usr/bin/wm-ng ] ; then
+   $ROOTCMD update-alternatives --set x-window-manager /usr/bin/wm-ng
+fi
+
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3