Deleted Added
full compact
rc.subr (230374) rc.subr (231667)
1# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
1# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
2# $FreeBSD: head/etc/rc.subr 230374 2012-01-20 10:31:27Z dougb $
2# $FreeBSD: head/etc/rc.subr 231667 2012-02-14 10:51:24Z dougb $
3#
4# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
5# All rights reserved.
6#
7# This code is derived from software contributed to The NetBSD Foundation
8# by Luke Mewburn.
9#
10# Redistribution and use in source and binary forms, with or without

--- 55 unchanged lines hidden (view full) ---

66
67 rcvars_obsolete="${rcvars_obsolete# } $1"
68 eval ${1}_newvar=\"$2\"
69 shift 2
70 eval ${_var}_obsolete_msg=\"$*\"
71}
72
73#
3#
4# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
5# All rights reserved.
6#
7# This code is derived from software contributed to The NetBSD Foundation
8# by Luke Mewburn.
9#
10# Redistribution and use in source and binary forms, with or without

--- 55 unchanged lines hidden (view full) ---

66
67 rcvars_obsolete="${rcvars_obsolete# } $1"
68 eval ${1}_newvar=\"$2\"
69 shift 2
70 eval ${_var}_obsolete_msg=\"$*\"
71}
72
73#
74# force_depend script
74# force_depend script [rcvar]
75# Force a service to start. Intended for use by services
75# Force a service to start. Intended for use by services
76# to resolve dependency issues. It is assumed the caller
77# has check to make sure this call is necessary
76# to resolve dependency issues.
78# $1 - filename of script, in /etc/rc.d, to run
77# $1 - filename of script, in /etc/rc.d, to run
78# $2 - name of the script's rcvar (minus the _enable)
79#
80force_depend()
81{
79#
80force_depend()
81{
82 local _depend _dep_rcvar
83
82 _depend="$1"
84 _depend="$1"
85 _dep_rcvar="${2:-$1}_enable"
83
86
87 [ -n "$rc_fast" ] && ! checkyesno always_force_depends &&
88 checkyesno $_dep_rcvar && return 0
89
90 /etc/rc.d/${_depend} forcestatus >/dev/null 2>&1 && return 0
91
84 info "${name} depends on ${_depend}, which will be forced to start."
85 if ! /etc/rc.d/${_depend} forcestart; then
86 warn "Unable to force ${_depend}. It may already be running."
87 return 1
88 fi
92 info "${name} depends on ${_depend}, which will be forced to start."
93 if ! /etc/rc.d/${_depend} forcestart; then
94 warn "Unable to force ${_depend}. It may already be running."
95 return 1
96 fi
89 return 0
90}
91
92#
93# checkyesno var
94# Test $1 variable, and warn if not set to YES or NO.
95# Return 0 if it's "yes" (et al), nonzero otherwise.
96#
97checkyesno()

--- 1639 unchanged lines hidden ---
97}
98
99#
100# checkyesno var
101# Test $1 variable, and warn if not set to YES or NO.
102# Return 0 if it's "yes" (et al), nonzero otherwise.
103#
104checkyesno()

--- 1639 unchanged lines hidden ---