Remove variables whose sole purpose was to make easier to

work with the NetBSD specific stuff.
This commit is contained in:
Mike Makonnen 2004-01-17 11:06:41 +00:00
parent 82387f41ed
commit 62e02b0dad
4 changed files with 13 additions and 29 deletions

View File

@ -13,24 +13,19 @@
arg=$1 arg=$1
RCVAR_SERVER="nfs_server_enable" start_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable ||
RCVAR_CLIENT="nfs_client_enable" [ -n "$rc_force" ]'
RCVAR_STATD="rpc_statd_enable"
RCVAR_LOCKD="rpc_lockd_enable"
start_precmd='checkyesno ${RCVAR_SERVER} || checkyesno ${RCVAR_CLIENT} ||
[ -n "$rc_force" ]'
stop_precmd=$start_precmd stop_precmd=$start_precmd
status_precmd=$start_precmd status_precmd=$start_precmd
name="statd" name="statd"
rcvar=${RCVAR_STATD} rcvar=rpc_statd_enable
command="/usr/sbin/rpc.${name}" command="/usr/sbin/rpc.${name}"
load_rc_config $name load_rc_config $name
run_rc_command "$arg" run_rc_command "$arg"
name="lockd" name="lockd"
rcvar=${RCVAR_LOCKD} rcvar=rpc_lockd_enable
command="/usr/sbin/rpc.${name}" command="/usr/sbin/rpc.${name}"
load_rc_config $name load_rc_config $name
run_rc_command "$arg" run_rc_command "$arg"

View File

@ -13,24 +13,19 @@
arg=$1 arg=$1
RCVAR_SERVER="nfs_server_enable" start_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable ||
RCVAR_CLIENT="nfs_client_enable" [ -n "$rc_force" ]'
RCVAR_STATD="rpc_statd_enable"
RCVAR_LOCKD="rpc_lockd_enable"
start_precmd='checkyesno ${RCVAR_SERVER} || checkyesno ${RCVAR_CLIENT} ||
[ -n "$rc_force" ]'
stop_precmd=$start_precmd stop_precmd=$start_precmd
status_precmd=$start_precmd status_precmd=$start_precmd
name="statd" name="statd"
rcvar=${RCVAR_STATD} rcvar=rpc_statd_enable
command="/usr/sbin/rpc.${name}" command="/usr/sbin/rpc.${name}"
load_rc_config $name load_rc_config $name
run_rc_command "$arg" run_rc_command "$arg"
name="lockd" name="lockd"
rcvar=${RCVAR_LOCKD} rcvar=rpc_lockd_enable
command="/usr/sbin/rpc.${name}" command="/usr/sbin/rpc.${name}"
load_rc_config $name load_rc_config $name
run_rc_command "$arg" run_rc_command "$arg"

View File

@ -18,8 +18,7 @@ start_precmd="rtadvd_precmd"
rtadvd_precmd() rtadvd_precmd()
{ {
IS_GATEWAY="checkyesno ipv6_gateway_enable" if ! checkyesno ipv6_gateway_enable ; then
if ! ${IS_GATEWAY}; then
warn \ warn \
"${name} cannot be used on IPv6 host, only on an IPv6 router." "${name} cannot be used on IPv6 host, only on an IPv6 router."
return 1 return 1

View File

@ -13,24 +13,19 @@
arg=$1 arg=$1
RCVAR_SERVER="nfs_server_enable" start_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable ||
RCVAR_CLIENT="nfs_client_enable" [ -n "$rc_force" ]'
RCVAR_STATD="rpc_statd_enable"
RCVAR_LOCKD="rpc_lockd_enable"
start_precmd='checkyesno ${RCVAR_SERVER} || checkyesno ${RCVAR_CLIENT} ||
[ -n "$rc_force" ]'
stop_precmd=$start_precmd stop_precmd=$start_precmd
status_precmd=$start_precmd status_precmd=$start_precmd
name="statd" name="statd"
rcvar=${RCVAR_STATD} rcvar=rpc_statd_enable
command="/usr/sbin/rpc.${name}" command="/usr/sbin/rpc.${name}"
load_rc_config $name load_rc_config $name
run_rc_command "$arg" run_rc_command "$arg"
name="lockd" name="lockd"
rcvar=${RCVAR_LOCKD} rcvar=rpc_lockd_enable
command="/usr/sbin/rpc.${name}" command="/usr/sbin/rpc.${name}"
load_rc_config $name load_rc_config $name
run_rc_command "$arg" run_rc_command "$arg"