summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authormtm <mtm@FreeBSD.org>2004-01-17 11:06:41 +0000
committermtm <mtm@FreeBSD.org>2004-01-17 11:06:41 +0000
commit8943c2aa717f1f67c5f2ecee778919c5f80bc213 (patch)
treecdac2d4a9d1913b49505353fc1d03b8dc4d09bce /etc
parent5da6236d0167eab4e233aaf815198eb7d1fe5898 (diff)
downloadFreeBSD-src-8943c2aa717f1f67c5f2ecee778919c5f80bc213.zip
FreeBSD-src-8943c2aa717f1f67c5f2ecee778919c5f80bc213.tar.gz
Remove variables whose sole purpose was to make easier to
work with the NetBSD specific stuff.
Diffstat (limited to 'etc')
-rw-r--r--etc/rc.d/lockd13
-rwxr-xr-xetc/rc.d/nfslocking13
-rwxr-xr-xetc/rc.d/rtadvd3
-rw-r--r--etc/rc.d/statd13
4 files changed, 13 insertions, 29 deletions
diff --git a/etc/rc.d/lockd b/etc/rc.d/lockd
index 6492849..b956d9f 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 6492849..b956d9f 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 38e74e7..21cf0bd 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 6492849..b956d9f 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"
OpenPOWER on IntegriCloud