projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make all shell scripts using /bin/bash instead /bin/sh to be able to FAI's environment.
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
90-update-alternatives
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index
67f0998
..
5aff20d
100755
(executable)
--- 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/
ba
sh
# 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>
# 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
$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
$ROOTCMD update-alternatives --set x-www-browser /usr/bin/iceweasel
fi
@@
-57,5
+57,11
@@
if [ -r $target/usr/bin/wm-ng ] ; then
fi
fi
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
## END OF FILE #################################################################
# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3