From thomas@cuivre.fr.eu.org  Thu Jan 31 13:32:48 2002
Return-Path: <thomas@cuivre.fr.eu.org>
Received: from melchior.cuivre.fr.eu.org (melchior.enst.fr [137.194.161.6])
	by hub.freebsd.org (Postfix) with ESMTP
	id C761137B405; Thu, 31 Jan 2002 13:32:47 -0800 (PST)
Received: from melusine.cuivre.fr.eu.org (melusine.enst.fr [137.194.160.34])
	by melchior.cuivre.fr.eu.org (Postfix) with ESMTP
	id DD82F84BD; Thu, 31 Jan 2002 22:32:45 +0100 (CET)
Received: by melusine.cuivre.fr.eu.org (Postfix, from userid 1000)
	id 6BF842C3D1; Thu, 31 Jan 2002 22:32:53 +0100 (CET)
Message-Id: <20020131223253.A1233@melusine.cuivre.fr.eu.org>
Date: Thu, 31 Jan 2002 22:32:53 +0100
From: Thomas Quinot <thomas@cuivre.fr.eu.org>
Reply-To: thomas@cuivre.fr.eu.org
To: sheldonh@FreeBSD.org
Cc: bug-followup@freebsd.org
In-Reply-To: <20020128122756.A78971@shalmaneser.enst.fr>; from quinot@inf.enst.fr on Mon, Jan 28, 2002 at 12:27:57PM +0100
Subject: Re: MFC: conf/31358: Need to load NFS client LKM
References: <20020128122756.A78971@shalmaneser.enst.fr>

>Number:         34506
>Category:       conf
>Synopsis:       Re: MFC: conf/31358: Need to load NFS client LKM
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    gnats-admin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 31 13:40:02 PST 2002
>Closed-Date:    Fri Feb 1 17:23:15 PST 2002
>Last-Modified:  Wed Oct 26 05:07:40 GMT 2005
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 > 	rev 1.292	src/etc/rc
 > 	rev 1.121	src/etc/rc.network
 > I plan to MFC this change onto the RELENG_4 branch in a month.  Thomas,
 > will this patch apply cleanly to and work on RELENG_4?
 
 Here is a patch for RELENG_4 that I have tested here with no obvious
 havoc:
 
 Index: rc
 ===================================================================
 RCS file: /home/ncvs/src/etc/rc,v
 retrieving revision 1.212.2.38
 diff -u -r1.212.2.38 rc
 --- rc	19 Dec 2001 17:52:17 -0000	1.212.2.38
 +++ rc	31 Jan 2002 21:30:35 -0000
 @@ -98,6 +98,7 @@
  }
  
  chkdepend amd amd_enable        portmap portmap_enable
 +chkdepend amd amd_enable        NFS nfs_client_enable
  chkdepend NFS nfs_server_enable portmap portmap_enable
  chkdepend NIS nis_server_enable portmap portmap_enable
  chkdepend NIS nis_client_enable portmap portmap_enable
 Index: rc.network
 ===================================================================
 RCS file: /home/ncvs/src/etc/rc.network,v
 retrieving revision 1.74.2.28
 diff -u -r1.74.2.28 rc.network
 --- rc.network	19 Dec 2001 17:52:17 -0000	1.74.2.28
 +++ rc.network	31 Jan 2002 21:30:36 -0000
 @@ -695,11 +695,39 @@
  
  	case ${nfs_client_enable} in
  	[Yy][Ee][Ss])
 -		echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
 -		if [ -n "${nfs_access_cache}" ]; then
 -		echo -n " NFS access cache time=${nfs_access_cache}"
 -		sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} \
 -			>/dev/null
 +		nfsclient_in_kernel=0
 +		# Handle absent nfs client support
 +		if sysctl vfs.nfs >/dev/null 2>&1; then
 +			nfsclient_in_kernel=1
 +		else
 +			kldload nfsclient && nfsclient_in_kernel=1
 +		fi
 +		if [ ${nfsclient_in_kernel} -eq 1 ]
 +		then
 +			echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
 +			if [ -n "${nfs_access_cache}" ]; then
 +				echo -n " NFS access cache time=${nfs_access_cache}"
 +				sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null
 +			fi
 +
 +			case ${amd_enable} in
 +			[Yy][Ee][Ss])
 +				echo -n ' amd'
 +				case ${amd_map_program} in
 +				[Nn][Oo] | '')
 +					;;
 +				*)
 +					amd_flags="${amd_flags} `eval ${amd_map_program}`"
 +					;;
 +				esac
 +		
 +				if [ -n "${amd_flags}" ]; then
 +					amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
 +				else
 +					amd 2> /dev/null
 +				fi
 +				;;
 +			esac
  		fi
  		;;
  	esac
 @@ -710,25 +738,6 @@
  	if [ -f /var/db/mounttab ]; then
  		rpc.umntall -k
  	fi
 -
 -	case ${amd_enable} in
 -	[Yy][Ee][Ss])
 -		echo -n ' amd'
 -		case ${amd_map_program} in
 -		[Nn][Oo] | '')
 -			;;
 -		*)
 -			amd_flags="${amd_flags} `eval ${amd_map_program}`"
 -			;;
 -		esac
 -
 -		if [ -n "${amd_flags}" ]; then
 -			amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
 -		else
 -			amd 2> /dev/null
 -		fi
 -		;;
 -	esac
  
  	case ${rwhod_enable} in
  	[Yy][Ee][Ss])
 
 -- 
     Thomas.Quinot@Cuivre.FR.EU.ORG
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: dd 
State-Changed-When: Fri Feb 1 17:23:15 PST 2002 
State-Changed-Why:  
not a new pr 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34506 
>Unformatted:
