diff options
Diffstat (limited to 'net-fs/autofs/files/autofs.rc6')
| -rw-r--r-- | net-fs/autofs/files/autofs.rc6 | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/net-fs/autofs/files/autofs.rc6 b/net-fs/autofs/files/autofs.rc6 index d8fd1a7337de..08be51ab7da9 100644 --- a/net-fs/autofs/files/autofs.rc6 +++ b/net-fs/autofs/files/autofs.rc6 @@ -1,13 +1,14 @@ #!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc6,v 1.1 2002/01/26 01:03:32 woodchip Exp $ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc6,v 1.1.1.1 2005/11/30 09:45:47 chriswhite Exp $ # rc file for automount using a Sun-style "master map". # We first look for a local /etc/auto.master, then a YP # map with that name depend() { + need ypbind need net } @@ -24,20 +25,21 @@ getmounts() { # if [ -f /etc/autofs/auto.master ] then - cat /etc/autofs/auto.master | sed -e '/^#/d' -e '/^$/d'| ( + cat /etc/autofs/auto.master | sed -e '/^ *[^# ]/!d'| ( while read dir map options do if [ ! -z "$dir" -a ! -z "$map" \ -a x`echo "$map" | cut -c1` != 'x-' ] then map=`echo "/etc/$map" | sed -e 's:^/etc//:/:'` - options=`echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g'` + timeout=`echo $options | sed --silent -e 's/\(.*\)\(--timeout=[0-9]\+\)\(.*\)/\2/g ; /--timeout=[0-9]\+/ p'` + options=`echo $options | sed -e 's/\(.*\)\(--timeout=[0-9]\+\)\(.*\)/\1\3/g ; s/\(^\|[ \t]\)-/\1/g'` if [ -x $map ]; then - echo "/usr/sbin/automount $dir program $map $options $localoptions" + echo "/usr/sbin/automount $timeout $dir program $map $options $localoptions" elif [ -f $map ]; then - echo "/usr/sbin/automount $dir file $map $options $localoptions" + echo "/usr/sbin/automount $timeout $dir file $map $options $localoptions" else - echo "/usr/sbin/automount $dir `basename $map` $options $localoptions" + echo "/usr/sbin/automount $timeout $dir `basename $map` $options $localoptions" fi fi done @@ -49,12 +51,12 @@ fi # if [ -e /usr/bin/ypcat ] && [ `ypcat -k auto.master 2>/dev/null | wc -l` -gt 0 ] then - ypcat -k auto.master | ( + ypcat -k auto.master | ( while read dir map options do - if [ ! -z "$dir" -a ! -z "$map" \ + if [ ! -z "$dir" -a ! -z "$map" \ -a x`echo "$map" | cut -c1` != 'x-' ] - then + then map=`echo "$map" | sed -e 's/^auto_/auto./'` if echo $options | grep -- '-t' >/dev/null 2>&1 ; then mountoptions="--timeout $(echo $options | \ @@ -63,26 +65,33 @@ then options=`echo "$options" | sed -e ' s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g s/\(^\|[ \t]\)-/\1/g'` - echo "/usr/sbin/automount $dir yp $map $options $localoptions" - fi + echo "/usr/sbin/automount $mountoptions $dir yp $map $options $localoptions" + fi done - ) + ) fi } start() { ebegin "Starting automounter" - getmounts | while read cmd mnt rest + getmounts | while read cmd timeout mnt rest do + #FIXME: this works but it really sucks + if echo $timeout|grep -v -- '--timeout' >/dev/null ; then + rest="$mnt $rest" + mnt="$timeout" + timeout="" + fi + echo -n " $mnt" - pidfile=/var/run/autofs`echo $mnt | sed 's/\//./'`.pid + pidfile=/var/run/autofs`echo $mnt | sed 's/\//./g'`.pid start-stop-daemon --start --pidfile $pidfile --quiet \ - --exec /usr/sbin/automount -- $mnt $rest + --exec /usr/sbin/automount -- $timeout $mnt $rest # # Automount needs a '--pidfile' or '-p' option. # For now we look for the pid ourself. # - ps ax | grep "[0-9]:[0-9][0-9] /usr/sbin/automount $mnt" | ( + ps ax | grep "[0-9]:[0-9][0-9] /usr/sbin/automount $timeout \?$mnt" | ( read pid rest echo $pid > $pidfile echo "$mnt $rest" >> $pidfile @@ -117,7 +126,7 @@ reload() { do pid=`head -n 1 $i 2>/dev/null` [ "$pid" = "" ] && continue - command=`tail +2 $i` + command=`tail -n +2 $i` if ! grep -q "^$command" $TMP then echo "Stopping automounter: $command" |