View | Details | Raw Unified | Return to bug 11593
Collapse All | Expand All

(-)a/startup/rc.d/init.d/netfs (-4 / +4 lines)
Lines 20-30 SourceIfNotEmpty /etc/sysconfig/network || exit 1 Link Here
20
20
21
LOCKFILE=/var/lock/subsys/netfs
21
LOCKFILE=/var/lock/subsys/netfs
22
22
23
NFSFSTAB=`grep -vs '^#' /etc/fstab |awk '{ if (($3 == "nfs") && ($4 !~ /noauto/)) print $2}'`
23
NFSFSTAB=`grep -vs '^#' /etc/fstab |awk '{ if (($3 ~ /nfs/) && ($4 !~ /noauto/)) print $2}'`
24
SMBFSTAB=`grep -vs '^#' /etc/fstab |awk '{ if (($3 == "smbfs") && ($4 !~ /noauto/)) print $2}'`
24
SMBFSTAB=`grep -vs '^#' /etc/fstab |awk '{ if (($3 == "smbfs") && ($4 !~ /noauto/)) print $2}'`
25
CIFSFSTAB=`grep -vs '^#' /etc/fstab |awk '{ if (($3 == "cifs") && ($4 !~ /noauto/)) print $2}'`
25
CIFSFSTAB=`grep -vs '^#' /etc/fstab |awk '{ if (($3 == "cifs") && ($4 !~ /noauto/)) print $2}'`
26
NCPFSTAB=`grep -vs '^#' /etc/fstab |awk '{ if ((($3 == "ncp") || ($3 == "ncpfs")) && ($4 !~ /noauto/)) print $2}'`
26
NCPFSTAB=`grep -vs '^#' /etc/fstab |awk '{ if ((($3 == "ncp") || ($3 == "ncpfs")) && ($4 !~ /noauto/)) print $2}'`
27
NFSMTAB=`grep -vs '^#' /proc/mounts |awk '{ if (($3 == "nfs") && ($2 != "/")) print $2}'`
27
NFSMTAB=`grep -vs '^#' /proc/mounts |awk '{ if (($3 ~ /nfs/) && ($2 != "/")) print $2}'`
28
SMBMTAB=`grep -vs '^#' /proc/mounts |awk '{ if (($3 == "smbfs") && ($2 != "/")) print $2}'`
28
SMBMTAB=`grep -vs '^#' /proc/mounts |awk '{ if (($3 == "smbfs") && ($2 != "/")) print $2}'`
29
CIFSMTAB=`grep -vs '^#' /proc/mounts |awk '{ if (($3 == "cifs") && ($2 != "/")) print $2}'`
29
CIFSMTAB=`grep -vs '^#' /proc/mounts |awk '{ if (($3 == "cifs") && ($2 != "/")) print $2}'`
30
NCPMTAB=`grep -vs '^#' /proc/mounts |awk '{ if ((($3 == "ncp") || ($3 == "ncpfs")) && ($2 != "/")) print $2}'`
30
NCPMTAB=`grep -vs '^#' /proc/mounts |awk '{ if ((($3 == "ncp") || ($3 == "ncpfs")) && ($2 != "/")) print $2}'`
Lines 37-43 start() Link Here
37
		[ -f /var/lock/subsys/portmap ] ||
37
		[ -f /var/lock/subsys/portmap ] ||
38
			service portmap start
38
			service portmap start
39
		[ -f /var/lock/subsys/portmap ] &&
39
		[ -f /var/lock/subsys/portmap ] &&
40
			action "Mounting NFS filesystems:" mount -a -t nfs
40
			action "Mounting NFS filesystems:" mount -a -t nfs,nfs4
41
	fi
41
	fi
42
	[ -z "$SMBFSTAB" ] || action "Mounting SMB filesystems:" mount -a -t smbfs
42
	[ -z "$SMBFSTAB" ] || action "Mounting SMB filesystems:" mount -a -t smbfs
43
	[ -z "$CIFSFSTAB" ] || action "Mounting CIFS filesystems:" mount -a -t cifs
43
	[ -z "$CIFSFSTAB" ] || action "Mounting CIFS filesystems:" mount -a -t cifs
Lines 50-56 stop() Link Here
50
{
50
{
51
	if [ -n "$NFSMTAB" ]; then
51
	if [ -n "$NFSMTAB" ]; then
52
		UnmountFilesystems 3 5 \
52
		UnmountFilesystems 3 5 \
53
			'($3 == "nfs") && ($2 != "/") {print $2}' \
53
			'($3 ~ /nfs/) && ($2 != "/") {print $2}' \
54
			"Unmounting NFS filesystem" \
54
			"Unmounting NFS filesystem" \
55
			"Unmounting NFS filesystem (retry)"
55
			"Unmounting NFS filesystem (retry)"
56
	fi
56
	fi

Return to bug 11593