X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=autofs.init;h=8416ac46c42161f95b2621f82eb7c848739ff039;hb=e5fd101c57ad356e7e758c4dc87bcbc33fee9b18;hp=273d041ca58cdd428ee51e44666e64d56e6ddbc2;hpb=7bb2308b4ad4ab494771a9d7861db4b2161969e0;p=packages%2Fautofs.git

diff --git a/autofs.init b/autofs.init
index 273d041..8416ac4 100644
--- a/autofs.init
+++ b/autofs.init
@@ -1,33 +1,38 @@
 #!/bin/sh
 #
-#       $Id$
+# autofs	automatically mounts filesystems when you use them,
+#		and unmounts them later when you are not using them.
 #
-#	/etc/rc.d/init.d/autofs
+# chkconfig:	2345 72 08
 #
-#	rc file for automount using a Sun-style "master map".
-#	We first look for a local /etc/autofs/auto.master, then a YP
-#	map with that name
+# description:	Script for automount using a Sun-style "master map". \
+#		We first look for a local /etc/autofs/auto.master, then a YP \
+#		map with that name
 #
-# chkconfig: 2345 72 08
-# description: automatically mounts filesystems when you use \
-#   them, and unmounts them later when you are not using them.
-# processname: automount
-#   Note that there may be multiple processes names automount
-# config: /etc/autofs/auto.master
-#   Note that all other config files are automatically reloaded
-#   and may be different on different systems; we can ignore them
-#   here
+# processname:	autofs
+# config:	/etc/autofs/auto.master
 
-# Source function library.
+
+# Source function library
 . /etc/rc.d/init.d/functions
 
-[ -f /usr/sbin/automount ] || exit 0
+# Get network config
+. /etc/sysconfig/network
 
-#
-# 	We can add local options here
-#	e.g. localoptions='rsize=8192,wsize=8192'
-#
-localoptions=''
+# Demon specified configuration.
+[ -f /etc/sysconfig/autofs ] && . /etc/sysconfig/autofs
+
+# Check that networking is up.
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		msg_network_down automounter
+		exit 1
+	fi
+else
+	exit 0
+fi
+
+DAEMON=/usr/sbin/automount
 
 #
 #	This function will build a list of automount commands to execute in
@@ -37,107 +42,119 @@ localoptions=''
 getmounts()
 {
 #
-#	Check for local maps to be loaded
+# Check for local maps to be loaded
 #
-if [ -f /etc/autofs/auto.master ]
-then
-    cat /etc/autofs/auto.master | sed -e '/^#/d' -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/autofs/$map" | sed -e 's:^/etc/autofs/:/:'`
- 		# special: treat -t or --timeout (or any reasonable derivative)
- 		# specially, since it can't be made a normal mount option.
- 		if echo $options | grep -- '-t' >/dev/null 2>&1 ; then
- 		    mountoptions="--timeout $(echo $options | \
- 		      sed 's/^.*-t\(imeout\)*[ \t]*\([0-9][0-9]*\).*$/\2/g')"
- 		fi
- 		options=`echo "$options" | sed -e '
- 		  s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g
- 		  s/\(^\|[ \t]\)-/\1/g'`
-		if [ -x $map ]; then
-		    echo "/usr/sbin/automount $mountoptions $dir program $map $options $localoptions"
-		elif [ -f $map ]; then
-		    echo "/usr/sbin/automount $mountoptions $dir file $map $options $localoptions"
+if [ -f /etc/autofs/auto.master ]; then
+	cat /etc/autofs/auto.master | sed -e '/^#/d' -e '/^$/d'| (
+	while read dir map options; do
+		if [ ! -z "$dir" -a ! -z "$map" -a x`echo "$map" | cut -c1` != 'x-' ]; then
+		    :
+		else
+		    continue
+		fi
+
+		maptype=${map%%:*}
+		if [ "$maptype" = "$map" ]; then
+			map=`echo "/etc/autofs/$map" | sed -e 's:^/etc/autofs//:/:'`
+			options=`echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g'`
+			if [ -x $map ]; then
+				echo "$DAEMON --timeout ${TIMEOUT} ${OPTIONS} $dir program $map $options"
+			elif [ -f $map ]; then
+				echo "$DAEMON --timeout ${TIMEOUT} ${OPTIONS} $dir file $map $options"
+			else
+				echo "$DAEMON --timeout ${TIMEOUT} ${OPTIONS} $dir `basename $map` $options"
+			fi
 		else
-		    echo "/usr/sbin/automount $mountoptions $dir `basename $map` $options $localoptions"
+			map=${map#*/}
+			if [ "$map" ]; then
+				if [ "$maptype" = "file" ]; then
+					map=`echo "/etc/autofs/$map" | sed -e 's:^/etc/autofs//:/:'`
+				fi
+				echo "$DAEMON --timeout $TIMEOUT ${OPTIONS} $dir $maptype $map $options"
+			fi
 		fi
-	    fi
 	done
-    )
+	)
 fi
 
 #
-#	Check for YellowPage maps to be loaded
+# Check for YellowPage maps to be loaded
 #
-if [ -e /usr/bin/ypcat ] && [ `ypcat -k auto.master 2>/dev/null | wc -l` -gt 0 ]
-then
-    ypcat -k auto.master | (
-	while read dir map options
-	do
-	    if [ ! -z "$dir" -a ! -z "$map" \
-			-a x`echo "$map" | cut -c1` != 'x-' ]
-	    then
-		map=`echo "$map" | sed -e 's/^auto_/auto./'`
-		if echo $options | grep -- '-t' >/dev/null 2>&1 ; then
-		    mountoptions="--timeout $(echo $options | \
-		      sed 's/^.*-t\(imeout\)*[ \t]*\([0-9][0-9]*\).*$/\2/g')"
-		fi
-		options=`echo "$options" | sed -e '
-		  s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g
-		  s/\(^\|[ \t]\)-/\1/g'`
-		echo "/usr/sbin/automount $mountoptions $dir yp $map $options $localoptions"
-	    fi
-	done
-    )
+if is_yes $USE_YP; then
+	if [ -e /usr/bin/ypcat ] && \
+	   [ `ypcat -k auto.master 2>/dev/null | wc -l` -gt 0 ]; then
+		ypcat -k auto.master | (
+		while read dir map options; do
+			if [ ! -z "$dir" -a ! -z "$map" \
+			   -a x`echo "$map" | cut -c1` != 'x-' ]; then
+				map=`echo "$map" | sed -e 's/^auto_/auto./'`
+				if echo $options | \
+				   grep -- '-t' >/dev/null 2>&1; then
+					mountoptions="--timeout $(echo $options | \
+					  sed 's/^.*-t\(imeout\)*[ \t]*\([0-9][0-9]*\).*$/\2/g')"
+				fi
+				options=`echo "$options" | sed -e '
+				  s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g
+				  s/\(^\|[ \t]\)-/\1/g'`
+				echo "$DAEMON --timeout $TIMEOUT ${OPTIONS} $mountoptions \
+				  $dir yp $map $options"
+			fi
+		done
+		)
+	fi
 fi
 }
 
-#
-#	See how we were called.
-#
+start() {
+	# Check if the service is already running?
+	if [ ! -f /var/lock/subsys/autofs ]; then
+		msg_starting automounter
+		busy
+#		getmounts | sh
+		$DAEMON --timeout $TIMEOUT /etc/autofs/auto.master
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && ok || fail
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/autofs
+	else
+		msg_already_running automounter
+	fi
+}
+
+stop() {
+	if [ -f /var/lock/subsys/autofs ]; then
+		msg_stopping automounter
+		killproc automount
+		rm -f /var/lock/subsys/autofs >/dev/null 2>&1
+	else
+		msg_not_running automounter
+	fi
+}
+
+RETVAL=0
+# See how we were called.
 case "$1" in
   start)
-	# Check if the automounter is already running?
-	if [ ! -f /var/lock/subsys/automount ]; then
-	    show Starting automounter
-	    busy
-	    getmounts | sh
-	    touch /var/lock/subsys/automount
-	    deltext
-	    ok
-	fi
+	start
 	;;
   stop)
-	show Stopping automounter
-	busy
-	killproc automount -TERM
-	rm -f /var/lock/subsys/automount
-	deltext
-	ok
+	stop
 	;;
-  restart|reload)
-	if [ ! -f /var/lock/subsys/automount ]; then
-		echo "Automounter not running"
-		exit 1
-	fi
-	$0 stop
-	$0 start
-	;;
-  status)
-	echo "Configured Mount Points:"
-	getmounts
-	echo ""
-	echo "Active Mount Points:"
-	ps ax|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | (
-		while read pid tt stat time command; do echo $command; done
-	)
+  restart|force-reload)
+	stop
+	start
 	;;
+#  status)
+#	nls "Configured Mount Points:"
+#	getmounts
+#	echo ""
+#	nls "Active Mount Points:"
+#	ps axw|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | (
+#		while read pid tt stat time command; do echo $command; done
+#	)
+#	;;
   *)
-	echo "Usage: $0 {start|stop|restart|reload|status}"
-	exit 1
+	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	exit 3
 esac
 
-exit 0
+exit $RETVAL