From 14791e190ad0b2532f302eb11a71595d95b24012 Mon Sep 17 00:00:00 2001 From: Thomas Nikolajsen Date: Sat, 18 Jul 2009 12:39:39 +0200 Subject: [PATCH] nfsclient: nfsiod isn't used anymore * Remove nfsclient rc.conf variable; it was just passed to nfsiod * Remove nfsiod execution from rc.d/nfsclient --- etc/defaults/rc.conf | 1 - etc/rc.d/nfsclient | 7 +------ share/man/man5/rc.conf.5 | 11 +---------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 625ef42876..9bfb94f6ee 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -190,7 +190,6 @@ amd_enable="NO" # Run amd service with $amd_flags (or NO). amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map" amd_map_program="NO" # Can be set to "ypcat -k amd.master" nfs_client_enable="NO" # This host is an NFS client (or NO). -nfs_client_flags="-n 4" # Flags to nfsiod (if enabled). nfs_access_cache="5" # Client attribute cache timeout in seconds #nfs_neg_cache="3" # Client attribute negative hit cache timeout nfs_server_enable="NO" # This host is an NFS server (or NO). diff --git a/etc/rc.d/nfsclient b/etc/rc.d/nfsclient index 5bc27481e0..1683fe56f5 100644 --- a/etc/rc.d/nfsclient +++ b/etc/rc.d/nfsclient @@ -31,14 +31,9 @@ nfsclient_precmd() nfsclient_start() { # - # Run nfsiod and set some nfs client related sysctls + # Set some nfs client related sysctls # echo -n "NFS CLIENT:" - if [ -n "${nfs_client_flags}" ]; then - echo -n ' nfsiod' - nfsiod ${nfs_client_flags} - fi - if [ -n "${nfs_access_cache}" ]; then sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null fi diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index cd8888b06a..44590376e2 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -1248,16 +1248,7 @@ will not be updated. .Pq Vt bool If set to .Dq Li YES , -run the NFS client daemons at boot time. -.It Va nfs_client_flags -.Pq Vt str -If -.Va nfs_client_enable -is set to -.Dq Li YES , -these are the flags to pass to the -.Xr nfsiod 8 -daemon. +setup NFS client parameters at boot time. .It Va nfs_access_cache .Pq Vt int If -- 2.41.0