hopefully a few fixes :)

5 files changed, 162 insertions, 4 deletions

diff --git a/net-fs/autofs/files/auto.misc b/net-fs/autofs/files/auto.misc
index cc20091c5621..254fa6bbe47b 100644
--- a/net-fs/autofs/files/auto.misc
+++ b/net-fs/autofs/files/auto.misc
@@ -1,7 +1,7 @@
-# $Id: auto.misc,v 1.1 2000/08/08 17:53:33 achim Exp $
+# $Id: auto.misc,v 1.2 2002/10/27 05:21:15 bcowan Exp $
 # This is an automounter map and it has the following format
 # key [ -mount-options-separated-by-comma ] location
 # Details may be found in the autofs(5) manpage
-boot		-fstype=ext2		:/dev/hda1
-cd		-fstype=iso9660,ro	:/dev/cdrom
-floppy		-fstype=auto		:/dev/fd0
+#boot		-fstype=ext2		:/dev/hda1
+#cd		-fstype=iso9660,ro	:/dev/cdrom
+#floppy		-fstype=auto		:/dev/fd0
diff --git a/net-fs/autofs/files/autofs.rc7 b/net-fs/autofs/files/autofs.rc7
new file mode 100644
index 000000000000..b85a2b0b43e4
--- /dev/null
+++ b/net-fs/autofs/files/autofs.rc7
@@ -0,0 +1,136 @@
+#!/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.rc7,v 1.1 2002/10/27 05:21:15 bcowan 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 net
+	use portmap ypbind
+}
+
+opts="start stop status stats reload restart"
+
+#
+# This function will build a list of automount commands to execute in
+# order to activate all the mount points. It is used to figure out
+# the difference of automount points in case of a reload
+#
+getmounts() {
+#
+# Check for local maps to be loaded
+#
+if [ -f /etc/autofs/auto.master ]
+then
+    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//:/:'`
+		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 $timeout $dir program $map $options $localoptions"
+		elif [ -f $map ]; then
+		    echo "/usr/sbin/automount $timeout $dir file $map $options $localoptions"
+		else
+		    echo "/usr/sbin/automount $timeout $dir `basename $map` $options $localoptions"
+		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 "/usr/sbin/automount $mountoptions $dir yp $map $options $localoptions"
+	    fi
+	done
+    )
+fi
+}
+
+start() {
+	ebegin "Starting automounter"
+	getmounts | while read cmd timeout mnt rest
+	do
+	    echo -n " $mnt"
+	    pidfile=/var/run/autofs`echo $mnt | sed 's/\//./g'`.pid
+	    start-stop-daemon --start --pidfile $pidfile --quiet \
+	    --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 $timeout \?$mnt" | (
+		read pid rest
+		echo $pid > $pidfile
+		echo "$mnt $rest" >> $pidfile
+	)
+	done
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping automounter"
+	start-stop-daemon --stop --quiet --signal 12 --exec /usr/sbin/automount
+	eend $?
+}
+
+stats() {
+	echo "Configured Mount Points:"
+	echo "------------------------"
+	getmounts
+	echo ""
+	echo "Active Mount Points:"
+	echo "--------------------"
+	ps awx | grep automount  | (
+		while read pid tt stat time command; do echo $command; done
+	)
+}
+
+reload() {
+	echo "Reloading automounter: checking for changes ... "
+	TMP=/var/run/autofs.tmp
+	getmounts >$TMP
+	for i in /var/run/autofs.*.pid
+	do
+		pid=`head -n 1 $i 2>/dev/null`
+		[ "$pid" = "" ] && continue
+		command=`tail +2 $i`
+		if ! grep -q "^$command" $TMP
+		then
+			echo "Stopping automounter: $command"
+			kill -USR2 $pid
+		fi
+	done
+	rm -f $TMP
+	svc_start
+}
+
+restart() {
+	svc_stop
+	svc_start
+}	
\ No newline at end of file
diff --git a/net-fs/autofs/files/autofs1.confd b/net-fs/autofs/files/autofs1.confd
new file mode 100644
index 000000000000..0d1c855d8dd3
--- /dev/null
+++ b/net-fs/autofs/files/autofs1.confd
@@ -0,0 +1,9 @@
+# Config file for /etc/init.d/autofs
+
+FLAGS="defaults 21"
+
+#
+# e.g. localoptions='rsize=8192,wsize=8192'
+# 
+localoptions='--timeout=60'
+
diff --git a/net-fs/autofs/files/digest-autofs-3.1.7-r4 b/net-fs/autofs/files/digest-autofs-3.1.7-r4
new file mode 100644
index 000000000000..c8410dc43753
--- /dev/null
+++ b/net-fs/autofs/files/digest-autofs-3.1.7-r4
@@ -0,0 +1 @@
+MD5 4f602f82442b48ce9c2e0005d59c3408 autofs-3.1.7.tar.bz2 57000
diff --git a/net-fs/autofs/files/nisyp.patch b/net-fs/autofs/files/nisyp.patch
new file mode 100644
index 000000000000..6e53909946eb
--- /dev/null
+++ b/net-fs/autofs/files/nisyp.patch
@@ -0,0 +1,12 @@
+diff -ruN autofs-3.1.7/daemon/Makefile autofs-3.1.7-patched/daemon/Makefile
+--- autofs-3.1.7/daemon/Makefile	2000-11-03 23:05:17.000000000 -0800
++++ autofs-3.1.7-patched/daemon/Makefile	2002-07-19 13:00:10.000000000 -0700
+@@ -13,7 +13,7 @@
+ 
+ CFLAGS += -rdynamic -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" -DVERSION_STRING=\"$(version)\" -I../include
+ LDFLAGS += -rdynamic
+-LIBS = -ldl
++LIBS = -ldl -lnsl
+ 
+ all: automount
+