X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=bf1f11e59e4a69167bcbdcee06b2d923219b4107;hb=9b3d5256107f1540b8b74a808118b71876852ea9;hp=e64a7c9b0a463f076e70766edbedad1f313e3a3b;hpb=5f5abbc3194cce210e20cc2f9142da649552adff;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 e64a7c9..bf1f11e 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives +++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives @@ -4,7 +4,6 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # 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 @@ -22,9 +21,9 @@ set -u # $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 /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 + $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/vi fi 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 ] ; then + $ROOTCMD ln -s /sbin/mount.ntfs-3g /sbin/mount.ntfs +fi + ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3