tail +2 -> tail -n +2 to be compatible with latest coreutils. Closes bug #62606.

6 files changed, 27 insertions, 173 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 3e1753872927..e9ea0f4bded5 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/autofs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.31 2004/07/28 03:41:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.32 2004/09/02 17:56:05 swegener Exp $
+
+  02 Sep 2004; Sven Wegener <swegener@gentoo.org> -files/autofs,
+  files/autofs.rc6, files/autofs.rc7, files/autofs.rc8:
+  tail +2 -> tail -n +2 to be compatible with latest coreutils. Closes bug
+  #62606.
 
   27 Jul 2004; <agriffis@gentoo.org> autofs-3.1.7-r5.ebuild:
   stable on ia64
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 0c95612b99df..e86c8e4912e9 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,19 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 71de42396d30a8a6bff6cd83f80e8c39 ChangeLog 4781
 MD5 9e0182d703eeb21b039d7d299cea75af autofs-3.1.7-r3.ebuild 1286
 MD5 5e5b4c1e32387a90b3f21ccf55d13386 autofs-3.1.7-r4.ebuild 1736
 MD5 3f9ef36aecb11a51f251a752482d7863 autofs-3.1.7-r5.ebuild 1750
 MD5 1c01a893e20ffda0d2e05c5de202c6cf autofs-3.1.7-r6.ebuild 1784
 MD5 f67d1e63c8588166e494744c81b250d5 autofs-4.0.0.ebuild 1929
-MD5 c4b1a2e68b4b44796a6e0c0f5a631487 ChangeLog 4574
-MD5 1d3c436cc14252035bf2d97228cd3f58 metadata.xml 224
 MD5 8ada6ad17d139fa85e4089066d3cbdfb autofs-4.1.3.ebuild 1930
+MD5 1d3c436cc14252035bf2d97228cd3f58 metadata.xml 224
 MD5 256e713e8b47896dd2049326ec26fc78 files/auto.home 239
 MD5 7dfc74b098600c091681c950b67b1022 files/auto.master 237
 MD5 aa40e8bef91418943312910e73d05eed files/auto.misc 319
-MD5 17069c72cadc641378d58ec1d0910647 files/autofs 3569
 MD5 a132f5883b92e2b509fa66e429f913ab files/autofs.confd 186
-MD5 4ed6214c798b913d17fee8c29b929890 files/autofs.rc6 3714
-MD5 f079f02077656ec5b29af9b106fd6148 files/autofs.rc7 3621
-MD5 5e0b8fae9e6d2ab306eef3bebdb0f0d5 files/autofs.rc8 5175
+MD5 1b6efbe0072911c5c960a27e09a9d024 files/autofs.rc6 3717
+MD5 4cc7219397b1bdb60da3f150bd7d9230 files/autofs.rc7 3624
+MD5 a6a4e5d34c61cce698c4fc381ca75b9b files/autofs.rc8 5178
 MD5 7fa23f910baa8aa00609bd74a60c8e34 files/autofs1.confd 137
 MD5 41de856a77a074078968ff244b863f88 files/automount.diff 322
 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r3 64
@@ -26,3 +28,10 @@ MD5 a872a3743192bbca4f78ecec7f74df03 files/ldap.diff 367
 MD5 3e9a4415d9928180bd9d1a7a09d4d2e7 files/ldap_config.patch 785
 MD5 77884391a3fbf365a88f5d2230b548d9 files/nisyp.patch 419
 MD5 39ac8cc927dab754a7694abdb1a2cdc5 files/open_max.diff 408
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBN161I1lqEGTUzyQRAl1pAJ0a/dQUSktIX0+RQzcJXlMvwYUGgwCdGLNK
+9OHB2iZ6+QH7aC8OC1d1TgQ=
+=SJUf
+-----END PGP SIGNATURE-----
diff --git a/net-fs/autofs/files/autofs b/net-fs/autofs/files/autofs
deleted file mode 100755
index 6b3911d023e0..000000000000
--- a/net-fs/autofs/files/autofs
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/sbin/runscript
-#RCUPDATE:3 4:75:
-# $Id: autofs,v 1.3 2002/08/14 21:03:39 raker 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
-#
-# On most distributions, this file should be called:
-# /etc/rc.d/init.d/autofs or /etc/init.d/autofs
-#
-
-. /etc/init.d/functions.sh
-
-FLAGS="defaults 21"
-
-#
-# Location of the automount daemon and the init directory
-#
-
-SERVICE=autofs
-EXE=/usr/sbin/automount
-opts="start stop restart status reload"
-
-#
-# We can add local options here
-# e.g. localoptions='rsize=8192,wsize=8192'
-#
-localoptions=''
-
-#
-# 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
-#
-function 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//:/:'`
-		options=`echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g'`
-		if [ -x $map ]; then
-		    echo "$EXE $dir program $map $options $localoptions"
-		elif [ -f $map ]; then
-		    echo "$EXE $dir file $map $options $localoptions"
-		else
-		    echo "$EXE $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 "$EXE $dir yp $map $options $localoptions"
-	    fi
-	done
-    )
-fi
-}
-
-#
-# Status lister.
-#
-function status()
-{
-	echo "Configured Mount Points:"
-	echo "------------------------"
-	getmounts
-	echo ""
-	echo "Active Mount Points:"
-	echo "--------------------"
-	ps ax|grep "[0-9]:[0-9][0-9] automount " | (
-		while read pid tt stat time command; do echo $command; done
-	)
-}
-
-start() {
-	ebegin "Starting automounter..."
-	getmounts | while read cmd mnt rest
-	do
-		echo -n " $mnt"
-		pidfile=/var/run/autofs`echo $mnt | sed 's/\//./g'`.pid
-		start-stop-daemon --start --pidfile $pidfile --quiet \
-			--exec $EXE -- $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] $EXE $mnt" | (
-			read pid rest
-			echo $pid > $pidfile
-			echo "$mnt $rest" >> $pidfile
-		)
-	done
-	eend $? "Error starting automounter"
-}
-
-stop() {
-	ebegin 'Stopping automounter.'
-	start-stop-daemon --stop --quiet --signal 12 --exec $EXE
-	eend $? "Error stopping automounter"
-
-}
-
-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
-	start
-}
-restart() {
-	stop
-	start
-}
-
-#doservice ${@}
-
-
-
-
diff --git a/net-fs/autofs/files/autofs.rc6 b/net-fs/autofs/files/autofs.rc6
index a3ccf7fa6a44..d482c27dc75c 100644
--- a/net-fs/autofs/files/autofs.rc6
+++ b/net-fs/autofs/files/autofs.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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.8 2004/07/14 23:33:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc6,v 1.9 2004/09/02 17:56:05 swegener Exp $
 
 # rc file for automount using a Sun-style "master map".
 # We first look for a local /etc/auto.master, then a YP
@@ -126,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"
diff --git a/net-fs/autofs/files/autofs.rc7 b/net-fs/autofs/files/autofs.rc7
index 4b6bc654fd44..ef525bde400c 100644
--- a/net-fs/autofs/files/autofs.rc7
+++ b/net-fs/autofs/files/autofs.rc7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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.rc7,v 1.4 2004/07/14 23:33:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc7,v 1.5 2004/09/02 17:56:05 swegener Exp $
 
 # rc file for automount using a Sun-style "master map".
 # We first look for a local /etc/auto.master, then a YP
@@ -119,7 +119,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"
diff --git a/net-fs/autofs/files/autofs.rc8 b/net-fs/autofs/files/autofs.rc8
index 9bc91bfa963d..fa2c0fe1ede5 100644
--- a/net-fs/autofs/files/autofs.rc8
+++ b/net-fs/autofs/files/autofs.rc8
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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.rc8,v 1.8 2004/07/14 23:33:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc8,v 1.9 2004/09/02 17:56:05 swegener Exp $
 
 # rc file for automount using a Sun-style "master map".
 # We first look for a local /etc/auto.master, then a YP
@@ -189,7 +189,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"