X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=autofs.init;h=86e78ce248485095dc9e1654a5279588ec7551c2;hb=67a6741df3edb64cf21dd92b3d7e034340d0e2e6;hp=0e97437080221d04aaee2d95318a8f21c7d99ba1;hpb=d2ed1b07a75efb6ebd4cace0945289a752bce5ab;p=packages%2Fautofs.git

diff --git a/autofs.init b/autofs.init
index 0e97437..86e78ce 100644
--- a/autofs.init
+++ b/autofs.init
@@ -5,11 +5,11 @@
 #
 # chkconfig:	2345 72 08
 #
-# description:	Script for automount using a Sun-style "master map".
-#		We first look for a local /etc/autofs/auto.master, then a YP
+# 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
 #
-# processname:	automount
+# processname:	autofs
 # config:	/etc/autofs/auto.master
 
 
@@ -20,14 +20,19 @@
 . /etc/sysconfig/network
 
 # Demon specified configuration.
-. /etc/sysconfig/autofs
+[ -f /etc/sysconfig/autofs ] && . /etc/sysconfig/autofs
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-	echo "WARNING: Networking is down. Autofs service can't be runed."
-	exit 1
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		# nls "ERROR: Networking is down. %s can't be run." <service>
+		msg_network_down automounter
+		exit 1
+	fi
+else
+	exit 0
 fi
-
+			
 DAEMON=/usr/sbin/automount
 
 #
@@ -40,98 +45,96 @@ getmounts()
 #
 # 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//:/:'`
-		options=`echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g'`
-		if [ -x $map ]; then
-		    echo "$DAEMON --timeout $TIMEOUT $dir program $map $options"
-		elif [ -f $map ]; then
-		    echo "$DAEMON --timeout $TIMEOUT $dir file $map $options"
-		else
-		    echo "$DAEMON --timeout $TIMEOUT $dir `basename $map` $options"
+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//:/:'`
+			options=`echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g'`
+			if [ -x $map ]; then
+				echo "$DAEMON --timeout $TIMEOUT $dir program $map $options"
+			elif [ -f $map ]; then
+				echo "$DAEMON --timeout $TIMEOUT $dir file $map $options"
+			else
+				echo "$DAEMON --timeout $TIMEOUT $dir `basename $map` $options"
+			fi
 		fi
-	    fi
 	done
-    )
+	)
 fi
 
 #
 # 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 "$DAEMON --timeout $TIMEOUT $mountoptions $dir yp $map $options"
-	    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 $mountoptions \
+				  $dir yp $map $options"
+			fi
+		done
+		)
+	fi
 fi
 }
 
-#
-#	See how we were called.
-#
+RETVAL=0
+# See how we were called.
 case "$1" in
   start)
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/automount ]; then
-		show Starting automounter
+	if [ ! -f /var/lock/subsys/autofs ]; then
+		msg_starting automounter
 		busy
-		if getmounts | sh; then
-		    deltext;ok
-		else
-		    deltext;ok
-		fi
+		getmounts | sh 
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && ok || fail
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/autofs
 	else
-	    echo "automount already is running"
+		msg_already_running automounter
 	fi
-	touch /var/lock/subsys/automount
 	;;
   stop)
-	show Stopping automounter
-	killproc automount -TERM
-	rm -f /var/lock/subsys/automount
-	;;
-  restart|reload)
-	if [ ! -f /var/lock/subsys/automount ]; then
-		echo "Automounter not running"
-		exit 1
+	if [ -f /var/lock/subsys/autofs ]; then
+		msg_stopping automounter
+#		automount -TERM
+		killproc automount
+		rm -f /var/lock/subsys/autofs >/dev/null 2>&1
+	else
+		msg_not_running automounter
 	fi
+	;;
+  restart|force-reload)
 	$0 stop
 	$0 start
+	exit $?
 	;;
   status)
-	echo "Configured Mount Points:"
+	nls "Configured Mount Points:"
 	getmounts
 	echo ""
-	echo "Active Mount Points:"
-	ps ax|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | (
+	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