Attachment 154340 Details for Bug 221037 – nfswait.patch

[patch] nfswait.patch

nfswait.patch (text/plain), 2.01 KB, created by Pierre Ossman on 2007-05-08 15:06:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Ossman

Created: 2007-05-08 15:06:39 UTC

Size: 2.01 KB

patch

obsolete

>--- netfs.orig	2007-05-08 16:48:43.000000000 +0200
>+++ netfs	2007-05-08 16:59:26.000000000 +0200
>@@ -5,6 +5,7 @@
> # Authors:	Bill Nottingham <notting@redhat.com>
> #		AJ Lewis <alewis@redhat.com>
> # 		Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
>+# 		Pierre Ossman, <drzeus@drzeus.cx>
> #
> # chkconfig: 345 25 75
> # description: Mounts and unmounts all Network File System (NFS), \
>@@ -16,6 +17,7 @@
> [ -f /etc/sysconfig/network ] || exit 0
> . /etc/init.d/functions
> . /etc/sysconfig/network
>+. /etc/sysconfig/netfs
> 
> # Check that networking is up.
> [ "${NETWORKING}" = "no" ] && exit 0
>@@ -26,18 +28,41 @@
> NCPFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "ncpfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
> NETDEVFSTAB=`LC_ALL=C awk '!/^#/ && $4 ~/_netdev/ && $4 !~ /noauto/ { print $1 }' /etc/fstab`
> 
>+NFSSRVS=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $3 != "nfsd" && $4 !~ /noauto/ { print $1 } ' /etc/fstab | sed 's/:.*$//' | sort | uniq`
>+
> NFSMTAB=`LC_ALL=C awk '$3 ~ /^nfs/ && $3 != "nfsd" && $2 != "/" { print $2 }' /proc/mounts`
> SMBMTAB=`LC_ALL=C awk '$3 == "smbfs" { print $2 }' /proc/mounts`
> CIFSMTAB=`LC_ALL=C awk '$3 == "cifs" { print $2 }' /proc/mounts`
> NCPMTAB=`LC_ALL=C awk '$3 == "ncpfs" { print $2 }' /proc/mounts`
> NETDEVMTAB=`LC_ALL=C awk '$4 ~ /_netdev/ && $2 != "/" { print $2 }' /etc/mtab`
> 
>+[ -n "$RETRANS" ] || RETRANS=120
>+
>+_wait_for_nfssrv() {
>+	local start now
>+	start=`date +%s`
>+	while ! showmount $1 > /dev/null 2>&1; do
>+		now=`date +%s`
>+		if [ $[ $now - $start ] -gt $RETRANS ]; then
>+			return 1
>+		fi
>+		sleep 1
>+	done
>+
>+	return 0
>+}
>+
> # See how we were called.
> case "$1" in
>   start)
>         [ -n "$NFSFSTAB" ] && 
> 	  {
> 	    [ ! -f /var/lock/subsys/portmap ] && service portmap start
>+	    if [ "${WAITFORNFS}" = "no" ]; then
>+	      for SRV in $NFSSRVS; do
>+	        action "Waiting for NFS server $SRV..." _wait_for_nfssrv $SRV
>+	      done
>+	    fi
> 	    action $"Mounting NFS filesystems: " mount -a -t nfs,nfs4
> 	  }
>         [ -n "$SMBFSTAB" ] && action $"Mounting SMB filesystems: " mount -a -t smbfs

Actions: View | Diff

Attachments on bug 221037: 144586 | 154340