X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=56a365e63d8ae5dedac61cb557b056b5446c5892;hb=c8e2121d4fb58568f0143ef4b853e932f8fd1ad3;hp=bf1f11e59e4a69167bcbdcee06b2d923219b4107;hpb=9b3d5256107f1540b8b74a808118b71876852ea9;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 bf1f11e..56a365e 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -1,4 +1,4 @@
-#!/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>
@@ -42,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
 
@@ -52,15 +52,15 @@ 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
+   if $ROOTCMD 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 ] ; then
-   $ROOTCMD ln -s /sbin/mount.ntfs-3g /sbin/mount.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 #################################################################