X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=67f0998aedc90fba390ecbfd7edcaf065febe15e;hb=cfb3ddf55a9f047d57dc3d3e0bbd12f941aaa6e1;hp=ac45baf1a42c9f81ea89f1fc2ae45d7cd245ba07;hpb=d9cf14645fa29b87c5b19a8a20bd8b465454827e;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 ac45baf..67f0998 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -4,25 +4,27 @@
 # 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: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"
+# 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
+      # 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 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
-else
-   # avoid "debug: unbound variable" for ifclass running with 'set -u'
-   true
 fi
 
 if [ -r $target/usr/bin/vim.basic ] ; then
@@ -48,5 +50,12 @@ 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
+   # activate wm-ng only if it is registered as x-window-manager:
+   if update-alternatives --list x-window-manager | grep -q wm-ng ; then
+     $ROOTCMD update-alternatives --set x-window-manager /usr/bin/wm-ng
+   fi
+fi
+
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3