X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=5aff20d79513f786e3ffe9f3741424b3e92bddfe;hb=3e5fb2360b0df8563ade7c0ec43acf655698fc13;hp=a194055ef67a8e29d0edce5e0e1dc0edc081fdf9;hpb=452816601c78128f1a021d8df426b229c0249a5b;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 a194055..5aff20d 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -1,10 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
 # Purpose:       set up /etc/alternatives/* according to grml preferences
 # 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 14:16:38 CEST 2008 [mika]
 ################################################################################
 
 set -u
@@ -21,10 +20,10 @@ set -u
       # 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 /usr/bin/editor /etc/alternatives/editor
-      $ROOTCMD ln -sf /etc/alternatives/editor /usr/bin/vim.tiny
-      $ROOTCMD ln -sf /usr/bin/vi /etc/alternatives/vi
-      $ROOTCMD ln -sf /etc/alternatives/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
 
@@ -43,7 +42,7 @@ if [ -r $target/etc/X11/cursors/whiteglass.theme ] ; then
    $ROOTCMD update-alternatives --set x-cursor-theme /etc/X11/cursors/whiteglass.theme
 fi
 
-if [ -r $target/usr/bin/iceweasel ] ; then
+if [ -r $target/usr/bin/iceweasel ] || [ -L $target/usr/bin/iceweasel ] ; then
    $ROOTCMD update-alternatives --set x-www-browser /usr/bin/iceweasel
 fi
 
@@ -51,5 +50,18 @@ 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
+
+# sadly isn't available via update-alternates, anyway - use
+# ntfs-3g (if available) as default for ntfs
+if [ -r $target/sbin/mount.ntfs-3g ] || [ -L $target/sbin/mount.ntfs-3g ] ; then
+   $ROOTCMD ln -sf /sbin/mount.ntfs-3g /sbin/mount.ntfs
+fi
+
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3