diff options
| author | Mike Makonnen <mtm@FreeBSD.org> | 2004-01-17 11:06:41 +0000 |
|---|---|---|
| committer | Mike Makonnen <mtm@FreeBSD.org> | 2004-01-17 11:06:41 +0000 |
| commit | 62e02b0dadc850801d9047df3a300bf689120072 (patch) | |
| tree | cdac2d4a9d1913b49505353fc1d03b8dc4d09bce /etc | |
| parent | 82387f41ed8ea99558a320325807a777e5deea5a (diff) | |
| download | src-62e02b0dadc850801d9047df3a300bf689120072.tar.gz src-62e02b0dadc850801d9047df3a300bf689120072.zip | |
Remove variables whose sole purpose was to make easier to
work with the NetBSD specific stuff.
Notes
Notes:
svn path=/head/; revision=124623
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.d/lockd | 13 | ||||
| -rwxr-xr-x | etc/rc.d/nfslocking | 13 | ||||
| -rwxr-xr-x | etc/rc.d/rtadvd | 3 | ||||
| -rw-r--r-- | etc/rc.d/statd | 13 |
4 files changed, 13 insertions, 29 deletions
diff --git a/etc/rc.d/lockd b/etc/rc.d/lockd index 649284930149..b956d9f482ae 100644 --- a/etc/rc.d/lockd +++ b/etc/rc.d/lockd @@ -13,24 +13,19 @@ arg=$1 -RCVAR_SERVER="nfs_server_enable" -RCVAR_CLIENT="nfs_client_enable" -RCVAR_STATD="rpc_statd_enable" -RCVAR_LOCKD="rpc_lockd_enable" - -start_precmd='checkyesno ${RCVAR_SERVER} || checkyesno ${RCVAR_CLIENT} || - [ -n "$rc_force" ]' +start_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable || + [ -n "$rc_force" ]' stop_precmd=$start_precmd status_precmd=$start_precmd name="statd" -rcvar=${RCVAR_STATD} +rcvar=rpc_statd_enable command="/usr/sbin/rpc.${name}" load_rc_config $name run_rc_command "$arg" name="lockd" -rcvar=${RCVAR_LOCKD} +rcvar=rpc_lockd_enable command="/usr/sbin/rpc.${name}" load_rc_config $name run_rc_command "$arg" diff --git a/etc/rc.d/nfslocking b/etc/rc.d/nfslocking index 649284930149..b956d9f482ae 100755 --- a/etc/rc.d/nfslocking +++ b/etc/rc.d/nfslocking @@ -13,24 +13,19 @@ arg=$1 -RCVAR_SERVER="nfs_server_enable" -RCVAR_CLIENT="nfs_client_enable" -RCVAR_STATD="rpc_statd_enable" -RCVAR_LOCKD="rpc_lockd_enable" - -start_precmd='checkyesno ${RCVAR_SERVER} || checkyesno ${RCVAR_CLIENT} || - [ -n "$rc_force" ]' +start_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable || + [ -n "$rc_force" ]' stop_precmd=$start_precmd status_precmd=$start_precmd name="statd" -rcvar=${RCVAR_STATD} +rcvar=rpc_statd_enable command="/usr/sbin/rpc.${name}" load_rc_config $name run_rc_command "$arg" name="lockd" -rcvar=${RCVAR_LOCKD} +rcvar=rpc_lockd_enable command="/usr/sbin/rpc.${name}" load_rc_config $name run_rc_command "$arg" diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd index 38e74e796e25..21cf0bd8a059 100755 --- a/etc/rc.d/rtadvd +++ b/etc/rc.d/rtadvd @@ -18,8 +18,7 @@ start_precmd="rtadvd_precmd" rtadvd_precmd() { - IS_GATEWAY="checkyesno ipv6_gateway_enable" - if ! ${IS_GATEWAY}; then + if ! checkyesno ipv6_gateway_enable ; then warn \ "${name} cannot be used on IPv6 host, only on an IPv6 router." return 1 diff --git a/etc/rc.d/statd b/etc/rc.d/statd index 649284930149..b956d9f482ae 100644 --- a/etc/rc.d/statd +++ b/etc/rc.d/statd @@ -13,24 +13,19 @@ arg=$1 -RCVAR_SERVER="nfs_server_enable" -RCVAR_CLIENT="nfs_client_enable" -RCVAR_STATD="rpc_statd_enable" -RCVAR_LOCKD="rpc_lockd_enable" - -start_precmd='checkyesno ${RCVAR_SERVER} || checkyesno ${RCVAR_CLIENT} || - [ -n "$rc_force" ]' +start_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable || + [ -n "$rc_force" ]' stop_precmd=$start_precmd status_precmd=$start_precmd name="statd" -rcvar=${RCVAR_STATD} +rcvar=rpc_statd_enable command="/usr/sbin/rpc.${name}" load_rc_config $name run_rc_command "$arg" name="lockd" -rcvar=${RCVAR_LOCKD} +rcvar=rpc_lockd_enable command="/usr/sbin/rpc.${name}" load_rc_config $name run_rc_command "$arg" |