diff options
| author | Gordon Tetlow <gordon@FreeBSD.org> | 2002-08-14 05:44:32 +0000 |
|---|---|---|
| committer | Gordon Tetlow <gordon@FreeBSD.org> | 2002-08-14 05:44:32 +0000 |
| commit | 88f7d3e22bfb37ad223b34c25e04c3f72d5557b1 (patch) | |
| tree | 74908b5b57031bedcbdeb25a3f0895ecc0a0e4b5 /etc/rc.d/mountd | |
| parent | 2ee93c5780c44f76d7b80571604e1ad8eefa6896 (diff) | |
| download | src-88f7d3e22bfb37ad223b34c25e04c3f72d5557b1.tar.gz src-88f7d3e22bfb37ad223b34c25e04c3f72d5557b1.zip | |
Clean up the scripts to use the new variables:
xntpd_* -> ntpd_*
portmap_* -> rpcbind_*
Also change single_mountd_enable -> mountd_enable
Changing the mountd flags brings us closer to NetBSD.
All of the old variable names are shimmed so you can continue to use the
old variable name.
Finally make /etc/rc.d/mountd no longer dependent on nfs as there are
(apparently) other consumers of mountd.
Submitted by: Mike Makonnen <makonnen@pacbell.net>
Notes
Notes:
svn path=/head/; revision=101851
Diffstat (limited to 'etc/rc.d/mountd')
| -rwxr-xr-x | etc/rc.d/mountd | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd index 6f0fe86eab6c..7de831bc684c 100755 --- a/etc/rc.d/mountd +++ b/etc/rc.d/mountd @@ -11,29 +11,17 @@ . /etc/rc.subr name="mountd" +rcvar=`set_rcvar` command="/usr/sbin/${name}" required_files="/etc/exports" start_precmd="mountd_precmd" extra_commands="reload" -case `${CMD_OSTYPE}` in -FreeBSD) - rcvar=`set_rcvar nfs_server` - ;; -NetBSD) - rcvar=`set_rcvar` - ;; -esac - mountd_precmd() { case `${CMD_OSTYPE}` in FreeBSD) - if ! sysctl vfs.nfsrv >/dev/null 2>&1; then - force_depend nfsserver || return 1 - fi - - if ! checkyesno portmap_enable && \ + if ! checkyesno rpcbind_enable && \ ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 then force_depend rpcbind || return 1 |