head	1.24;
access;
symbols
	RELENG_8_4:1.24.0.2
	RELENG_9_1_0_RELEASE:1.22.2.2.2.2
	RELENG_9_1:1.22.2.2.0.2
	RELENG_9_1_BP:1.22.2.2
	RELENG_8_3_0_RELEASE:1.21.2.2.2.1
	RELENG_8_3:1.21.2.2.0.2
	RELENG_8_3_BP:1.21.2.2
	RELENG_9_0_0_RELEASE:1.22.2.1.2.1
	RELENG_9_0:1.22.2.1.0.2
	RELENG_9_0_BP:1.22.2.1
	RELENG_9:1.22.0.2
	RELENG_9_BP:1.22
	RELENG_7_4_0_RELEASE:1.13.2.4.2.1
	RELENG_8_2_0_RELEASE:1.21.2.1.6.1
	RELENG_7_4:1.13.2.4.0.2
	RELENG_7_4_BP:1.13.2.4
	RELENG_8_2:1.21.2.1.0.6
	RELENG_8_2_BP:1.21.2.1
	RELENG_8_1_0_RELEASE:1.21.2.1.4.1
	RELENG_8_1:1.21.2.1.0.4
	RELENG_8_1_BP:1.21.2.1
	RELENG_7_3_0_RELEASE:1.13.2.3.6.1
	RELENG_7_3:1.13.2.3.0.6
	RELENG_7_3_BP:1.13.2.3
	RELENG_8_0_0_RELEASE:1.21.2.1.2.1
	RELENG_8_0:1.21.2.1.0.2
	RELENG_8_0_BP:1.21.2.1
	RELENG_8:1.21.0.2
	RELENG_8_BP:1.21
	RELENG_7_2_0_RELEASE:1.13.2.3.4.1
	RELENG_7_2:1.13.2.3.0.4
	RELENG_7_2_BP:1.13.2.3
	RELENG_7_1_0_RELEASE:1.13.2.3.2.1
	RELENG_6_4_0_RELEASE:1.11.2.5.2.1
	RELENG_7_1:1.13.2.3.0.2
	RELENG_7_1_BP:1.13.2.3
	RELENG_6_4:1.11.2.5.0.2
	RELENG_6_4_BP:1.11.2.5
	RELENG_7_0_0_RELEASE:1.13.2.1
	RELENG_6_3_0_RELEASE:1.11.2.4
	RELENG_7_0:1.13.2.1.0.2
	RELENG_7_0_BP:1.13.2.1
	RELENG_6_3:1.11.2.4.0.2
	RELENG_6_3_BP:1.11.2.4
	RELENG_7:1.13.0.2
	RELENG_7_BP:1.13
	RELENG_6_2_0_RELEASE:1.11.2.2
	RELENG_6_2:1.11.2.2.0.2
	RELENG_6_2_BP:1.11.2.2
	RELENG_6_1_0_RELEASE:1.11.2.1
	RELENG_6_1:1.11.2.1.0.2
	RELENG_6_1_BP:1.11.2.1
	RELENG_6:1.11.0.2
	old_RELENG_6_0:1.7.0.4
	old_RELENG_6_0_BP:1.7
	old_RELENG_6:1.7.0.2
	old_RELENG_6_BP:1.7
	old_RELENG_5_4_0_RELEASE:1.5.2.1
	old_RELENG_5_4:1.5.2.1.0.4
	old_RELENG_5_4_BP:1.5.2.1
	old_RELENG_5_3_0_RELEASE:1.5.2.1
	old_RELENG_5_3:1.5.2.1.0.2
	old_RELENG_5_3_BP:1.5.2.1
	old_RELENG_5:1.5.0.2
	old_RELENG_5_BP:1.5
	old_RELENG_5_2_1_RELEASE:1.4
	old_RELENG_5_2_0_RELEASE:1.4
	old_RELENG_5_2:1.4.0.4
	old_RELENG_5_2_BP:1.4
	old_RELENG_5_1_0_RELEASE:1.4
	old_RELENG_5_1:1.4.0.2
	old_RELENG_5_1_BP:1.4
	old_RELENG_5_0_0_RELEASE:1.2
	old_RELENG_5_0:1.2.0.2
	old_RELENG_5_0_BP:1.2;
locks; strict;
comment	@# @;


1.24
date	2012.11.17.01.49.05;	author svnexp;	state Exp;
branches
	1.24.2.1;
next	1.23;

1.23
date	2012.01.14.02.18.41;	author dougb;	state Exp;
branches;
next	1.22;

1.22
date	2009.09.14.16.52.38;	author emaste;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	2008.05.26.10.39.46;	author bz;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2008.04.10.01.32.49;	author brooks;	state Exp;
branches;
next	1.19;

1.19
date	2008.04.06.20.39.33;	author brooks;	state Exp;
branches;
next	1.18;

1.18
date	2008.03.28.07.57.51;	author brooks;	state Exp;
branches;
next	1.17;

1.17
date	2008.03.26.21.54.48;	author brooks;	state Exp;
branches;
next	1.16;

1.16
date	2008.01.26.14.02.19;	author mtm;	state Exp;
branches;
next	1.15;

1.15
date	2007.10.18.17.10.40;	author emax;	state Exp;
branches;
next	1.14;

1.14
date	2007.10.12.16.35.36;	author emax;	state Exp;
branches;
next	1.13;

1.13
date	2007.03.31.09.03.38;	author mtm;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2006.10.26.00.29.43;	author avatar;	state Exp;
branches;
next	1.11;

1.11
date	2005.10.29.05.00.25;	author yar;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2005.10.28.16.10.56;	author yar;	state Exp;
branches;
next	1.9;

1.9
date	2005.10.28.16.07.52;	author yar;	state Exp;
branches;
next	1.8;

1.8
date	2005.10.23.14.06.53;	author yar;	state Exp;
branches;
next	1.7;

1.7
date	2004.12.15.12.39.28;	author brian;	state Exp;
branches;
next	1.6;

1.6
date	2004.10.07.13.55.26;	author mtm;	state Exp;
branches;
next	1.5;

1.5
date	2004.03.08.12.25.05;	author pjd;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2003.04.18.17.55.05;	author mtm;	state Exp;
branches;
next	1.3;

1.3
date	2003.01.25.23.03.48;	author mtm;	state Exp;
branches;
next	1.2;

1.2
date	2002.10.12.10.31.31;	author schweikh;	state Exp;
branches;
next	1.1;

1.1
date	2002.06.13.22.14.36;	author gordon;	state Exp;
branches;
next	;

1.24.2.1
date	2012.11.17.01.49.05;	author svnexp;	state dead;
branches;
next	1.24.2.2;

1.24.2.2
date	2013.03.28.13.02.44;	author svnexp;	state Exp;
branches;
next	;

1.22.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.22.2.1.2.1;
next	1.22.2.2;

1.22.2.2
date	2012.02.14.10.16.56;	author dougb;	state Exp;
branches
	1.22.2.2.2.1;
next	1.22.2.3;

1.22.2.3
date	2012.11.17.11.36.11;	author svnexp;	state Exp;
branches;
next	;

1.22.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.22.2.1.2.2;

1.22.2.1.2.2
date	2012.11.17.08.36.11;	author svnexp;	state Exp;
branches;
next	;

1.22.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.22.2.2.2.2;

1.22.2.2.2.2
date	2012.11.17.08.47.01;	author svnexp;	state Exp;
branches;
next	;

1.21.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.21.2.1.2.1
	1.21.2.1.4.1
	1.21.2.1.6.1;
next	1.21.2.2;

1.21.2.2
date	2012.02.14.10.17.14;	author dougb;	state Exp;
branches
	1.21.2.2.2.1;
next	1.21.2.3;

1.21.2.3
date	2012.11.17.10.35.57;	author svnexp;	state Exp;
branches;
next	;

1.21.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.21.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.21.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.21.2.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.21.2.2.2.2;

1.21.2.2.2.2
date	2012.11.17.08.24.38;	author svnexp;	state Exp;
branches;
next	;

1.13.2.1
date	2007.10.31.16.42.41;	author emax;	state Exp;
branches;
next	1.13.2.2;

1.13.2.2
date	2008.04.06.20.40.24;	author brooks;	state Exp;
branches;
next	1.13.2.3;

1.13.2.3
date	2008.04.15.22.34.39;	author brooks;	state Exp;
branches
	1.13.2.3.2.1
	1.13.2.3.4.1
	1.13.2.3.6.1;
next	1.13.2.4;

1.13.2.4
date	2010.08.17.21.28.40;	author jhb;	state Exp;
branches
	1.13.2.4.2.1;
next	1.13.2.5;

1.13.2.5
date	2012.02.14.10.17.30;	author dougb;	state Exp;
branches;
next	1.13.2.6;

1.13.2.6
date	2012.11.17.08.01.22;	author svnexp;	state Exp;
branches;
next	;

1.13.2.3.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.13.2.3.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.13.2.3.6.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.13.2.4.2.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.13.2.4.2.2;

1.13.2.4.2.2
date	2012.11.17.08.16.37;	author svnexp;	state Exp;
branches;
next	;

1.11.2.1
date	2006.01.21.22.42.43;	author yar;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2006.10.31.03.29.27;	author avatar;	state Exp;
branches;
next	1.11.2.3;

1.11.2.3
date	2007.05.15.08.01.42;	author mtm;	state Exp;
branches;
next	1.11.2.4;

1.11.2.4
date	2007.10.31.18.53.07;	author emax;	state Exp;
branches;
next	1.11.2.5;

1.11.2.5
date	2008.04.15.22.37.43;	author brooks;	state Exp;
branches
	1.11.2.5.2.1;
next	1.11.2.6;

1.11.2.6
date	2012.11.17.07.39.08;	author svnexp;	state Exp;
branches;
next	;

1.11.2.5.2.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.5.2.1
date	2004.10.10.09.50.54;	author mtm;	state Exp;
branches;
next	;


desc
@@


1.24
log
@Switching exporter and resync
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/ppp 230099 2012-01-14 02:18:41Z dougb $
#

# PROVIDE: ppp
# REQUIRE: netif
# KEYWORD: nojail

. /etc/rc.subr

name="ppp"
rcvar="ppp_enable"
command="/usr/sbin/${name}"
start_cmd="ppp_start"
stop_cmd="ppp_stop"
start_postcmd="ppp_poststart"

ppp_start_profile()
{
	local _ppp_profile _ppp_mode _ppp_nat _ppp_unit
	local _ppp_profile_cleaned _punct _punct_c

	_ppp_profile=$1
	_ppp_profile_cleaned=$1
	_punct=". - / +"
	for _punct_c in $_punct; do
		_ppp_profile_cleaned=`ltr ${_ppp_profile_cleaned} ${_punct_c} '_'`
	done

	# Check for ppp profile mode override.
	#
	eval _ppp_mode=\$ppp_${_ppp_profile_cleaned}_mode
	if [ -z "$_ppp_mode" ]; then
		_ppp_mode=$ppp_mode
	fi

	# Check for ppp profile nat override.
	#
	eval _ppp_nat=\$ppp_${_ppp_profile_cleaned}_nat
	if [ -z "$_ppp_nat" ]; then
		_ppp_nat=$ppp_nat
	fi

	# Establish ppp mode.
	#
	if [ "${_ppp_mode}" != "ddial" -a "${_ppp_mode}" != "direct" \
		-a "${_ppp_mode}" != "dedicated" \
		-a "${_ppp_mode}" != "background" ]; then
		_ppp_mode="auto"
	fi

	rc_flags="-quiet -${_ppp_mode}"

	# Switch on NAT mode?
	#
	case ${_ppp_nat} in
	[Yy][Ee][Ss])
		rc_flags="$rc_flags -nat"
		;;
	esac

	# Check for hard wired unit
	eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit
	if [ -n "${_ppp_unit}" ]; then
		_ppp_unit="-unit${_ppp_unit}"
	fi
	rc_flags="$rc_flags $_ppp_unit"

	# Run!
	#
	su -m $ppp_user -c "$command ${rc_flags} ${_ppp_profile}"
}

ppp_start()
{
	local _ppp_profile _p

	_ppp_profile=$*
	if [ -z "${_ppp_profile}" ]; then
		_ppp_profile=$ppp_profile
	fi

	echo -n "Starting PPP profile:"

	for _p in $_ppp_profile; do
		echo -n " $_p"
		ppp_start_profile $_p
	done

	echo "."
}

ppp_poststart()
{
	# Re-Sync ipfilter and pf so they pick up any new network interfaces
	#
	if [ -f /etc/rc.d/ipfilter ]; then
		/etc/rc.d/ipfilter quietresync
	fi
	if [ -f /etc/rc.d/pf ]; then
		/etc/rc.d/pf quietresync
	fi
}

ppp_stop_profile() {
	local _ppp_profile

	_ppp_profile=$1

	/bin/pkill -f "^${command}.*[[:space:]]${_ppp_profile}\$" || \
		echo -n "(not running)"
}

ppp_stop() {
	local _ppp_profile _p

	_ppp_profile=$*
	if [ -z "${_ppp_profile}" ]; then
		_ppp_profile=$ppp_profile
	fi

	echo -n "Stopping PPP profile:"

	for _p in $_ppp_profile; do
		echo -n " $_p"
		ppp_stop_profile $_p
	done

	echo "."
}

load_rc_config $name
run_rc_command $*
@


1.24.2.1
log
@file ppp was added on branch RELENG_8_4 on 2013-03-28 13:02:44 +0000
@
text
@d1 134
@


1.24.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 130
#!/bin/sh
#
# $FreeBSD: releng/8.4/etc/rc.d/ppp 231655 2012-02-14 10:17:14Z dougb $
#

# PROVIDE: ppp
# REQUIRE: netif
# KEYWORD: nojail

. /etc/rc.subr

name="ppp"
rcvar="ppp_enable"
command="/usr/sbin/${name}"
start_cmd="ppp_start"
stop_cmd="ppp_stop"
start_postcmd="ppp_poststart"

ppp_start_profile()
{
	local _ppp_profile _ppp_mode _ppp_nat _ppp_unit
	local _ppp_profile_cleaned _punct _punct_c

	_ppp_profile=$1
	_ppp_profile_cleaned=$1
	_punct=". - / +"
	for _punct_c in $_punct; do
		_ppp_profile_cleaned=`ltr ${_ppp_profile_cleaned} ${_punct_c} '_'`
	done

	# Check for ppp profile mode override.
	#
	eval _ppp_mode=\$ppp_${_ppp_profile_cleaned}_mode
	if [ -z "$_ppp_mode" ]; then
		_ppp_mode=$ppp_mode
	fi

	# Check for ppp profile nat override.
	#
	eval _ppp_nat=\$ppp_${_ppp_profile_cleaned}_nat
	if [ -z "$_ppp_nat" ]; then
		_ppp_nat=$ppp_nat
	fi

	# Establish ppp mode.
	#
	if [ "${_ppp_mode}" != "ddial" -a "${_ppp_mode}" != "direct" \
		-a "${_ppp_mode}" != "dedicated" \
		-a "${_ppp_mode}" != "background" ]; then
		_ppp_mode="auto"
	fi

	rc_flags="-quiet -${_ppp_mode}"

	# Switch on NAT mode?
	#
	case ${_ppp_nat} in
	[Yy][Ee][Ss])
		rc_flags="$rc_flags -nat"
		;;
	esac

	# Check for hard wired unit
	eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit
	if [ -n "${_ppp_unit}" ]; then
		_ppp_unit="-unit${_ppp_unit}"
	fi
	rc_flags="$rc_flags $_ppp_unit"

	# Run!
	#
	su -m $ppp_user -c "$command ${rc_flags} ${_ppp_profile}"
}

ppp_start()
{
	local _ppp_profile _p

	_ppp_profile=$*
	if [ -z "${_ppp_profile}" ]; then
		_ppp_profile=$ppp_profile
	fi

	echo -n "Starting PPP profile:"

	for _p in $_ppp_profile; do
		echo -n " $_p"
		ppp_start_profile $_p
	done

	echo "."
}

ppp_poststart()
{
	# Re-Sync ipfilter and pf so they pick up any new network interfaces
	#
	/etc/rc.d/ipfilter quietresync
	/etc/rc.d/pf quietresync
}

ppp_stop_profile() {
	local _ppp_profile

	_ppp_profile=$1

	/bin/pkill -f "^${command}.*[[:space:]]${_ppp_profile}\$" || \
		echo -n "(not running)"
}

ppp_stop() {
	local _ppp_profile _p

	_ppp_profile=$*
	if [ -z "${_ppp_profile}" ]; then
		_ppp_profile=$ppp_profile
	fi

	echo -n "Stopping PPP profile:"

	for _p in $_ppp_profile; do
		echo -n " $_p"
		ppp_stop_profile $_p
	done

	echo "."
}

load_rc_config $name
run_rc_command $*
@


1.23
log
@SVN rev 230099 on 2012-01-14 02:18:41Z by dougb

Prepare for the removal of set_rcvar() by changing the rcvar=
assignments to the literal values it would have returned.

The concept of set_rcvar() was nice in theory, but the forks
it creates are a drag on the startup process, which is especially
noticeable on slower systems, such as embedded ones.

During the discussion on freebsd-rc@@ a preference was expressed for
using ${name}_enable instead of the literal values. However the
code portability concept doesn't really apply since there are so
many other places where the literal name has to be searched for
and replaced. Also, using the literal value is also a tiny bit
faster than dereferencing the variables, and every little bit helps.
@
text
@d3 1
a3 1
# $FreeBSD$
@


1.22
log
@SVN rev 197196 on 2009-09-14 16:52:38Z by emaste

Protect cross-script invocation by checking that the target script exists.
This allows pruning of rc.d scripts without getting too many ugly boottime
error messages.

Inspired by phk's r128714 change to netif.
@
text
@d13 1
a13 1
rcvar=`set_rcvar`
@


1.22.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.22.2.2
log
@SVN rev 231653 on 2012-02-14 10:16:56Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="ppp_enable"
@


1.22.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/9/etc/rc.d/ppp 231653 2012-02-14 10:16:56Z dougb $
@


1.22.2.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.22.2.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/ppp 231653 2012-02-14 10:16:56Z dougb $
@


1.22.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.22.2.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/ppp 197196 2009-09-14 16:52:38Z emaste $
@


1.21
log
@Remove ISDN4BSD (I4B) from HEAD as it is not MPSAFE and
parts relied on the now removed NET_NEEDS_GIANT.
Most of I4B has been disconnected from the build
since July 2007 in HEAD/RELENG_7.

This is what was removed:
- configuration in /etc/isdn
- examples
- man pages
- kernel configuration
- sys/i4b (drivers, layers, include files)
- user space tools
- i4b support from ppp
- further documentation

Discussed with: rwatson, re
@
text
@d98 6
a103 2
	/etc/rc.d/ipfilter quietresync
	/etc/rc.d/pf quietresync
@


1.21.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.21.2.2
log
@SVN rev 231655 on 2012-02-14 10:17:14Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="ppp_enable"
@


1.21.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/8/etc/rc.d/ppp 231655 2012-02-14 10:17:14Z dougb $
@


1.21.2.2.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.21.2.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/ppp 231655 2012-02-14 10:17:14Z dougb $
@


1.21.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.21.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.21.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.20
log
@Declare _ppp_profile_cleaned, _punct, and _punct_c local in
ppp_start_profile().

Reported by:	yar
MFC after:	1 week
@
text
@d7 1
a7 1
# REQUIRE: netif isdnd
@


1.19
log
@Fix a stupid typo.

Reviewed by:	bz
@
text
@d22 1
@


1.18
log
@Add support for hardwiring ppp sessions to particular devices with new
per-profile variables of the form ppp_<profile>_unit.  No ppp_unit
variable is supported since tying the same unit to more than one profile
won't work.

PR:		conf/122127
MFC after:	1 week
@
text
@d64 1
a64 1
	if [ -n "_ppp_unit" ]; then
@


1.17
log
@Allow the characters .-+/ to appear in ppp profile names by folding them
to _ when evaluating ppp_<profile>_nat and ppp_<profile>_mode.  Document
the per-profile variables.

PR:		conf/121452, conf/122127 (partial)
MFC after:	1 week
@
text
@d21 1
a21 1
	local _ppp_profile _ppp_mode _ppp_nat
d62 7
@


1.16
log
@Generally, anything that runs rc.d scripts internally should
start using the quiet prefix (i.e. quietstart, quietstop, etc...).
@
text
@d24 5
d32 1
a32 1
	eval _ppp_mode=\$ppp_${_ppp_profile}_mode
d39 1
a39 1
	eval _ppp_nat=\$ppp_${_ppp_profile}_nat
@


1.15
log
@Teach /etc/rc.d/ppp how to start/stop individual instances
of ppp. This is an extension of previous commit.

Submitted by:	Yuri Kurenkov < y dot kurenkov at init dot ru >
Reviewed by:	mtm
MFC after:	3 days
@
text
@d85 2
a86 2
	/etc/rc.d/ipfilter resync
	/etc/rc.d/pf resync
@


1.14
log
@Teach /etc/rc.d/ppp to start multiple instances of ppp.

ppp_profile variable can now contain multiple profiles.
Overrides for ppp mode and nat can go into ppp_$profile_mode
and ppp_$profile_nat variables respectively. If those are
not specified, defaults from ppp_mode and ppp_nat are used.

Submitted by:	Yuri Kurenkov < y dot kurenkov at init dot ru >
Reviewed by:	mtm
MFC after:	1 week
@
text
@d16 1
d64 6
a69 1
	local _p
d73 1
a73 1
	for _p in $ppp_profile; do
d89 27
d117 1
a117 1
run_rc_command "$1"
@


1.13
log
@Make subroutine names more conformant with other scripts in rc.d.

MFC After: 2 weeks
@
text
@d15 1
a15 1
start_precmd="ppp_prestart"
d18 1
a18 1
ppp_prestart()
d20 18
d40 4
a43 4
	if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \
		-a "${ppp_mode}" != "dedicated" \
		-a "${ppp_mode}" != "background" ]; then
		ppp_mode="auto"
d46 1
a46 1
	rc_flags="$rc_flags -quiet -${ppp_mode}"
d50 1
a50 1
	case ${ppp_nat} in
d56 17
a72 1
	rc_flags="$rc_flags ${ppp_profile}"
@


1.13.2.1
log
@MFC: etc/rc.d/ppp,v1.14 and etc/defaults/rc.conf,v1.319

Teach /etc/rc.d/ppp to start multiple instances of ppp.

ppp_profile variable can now contain multiple profiles.
Overrides for ppp mode and nat can go into ppp_$profile_mode
and ppp_$profile_nat variables respectively. If those are
not specified, defaults from ppp_mode and ppp_nat are used.

MFC: etc/rc.d/ppp v1.15

Teach /etc/rc.d/ppp how to start/stop individual instances
of ppp. This is an extension of previous commit.

Submitted by:	Yuri Kurenkov < y dot kurenkov at init dot ru >
Reviewed by:	mtm
Approved by:	re (kensmith)
@
text
@d15 1
a15 2
start_cmd="ppp_start"
stop_cmd="ppp_stop"
d18 1
a18 1
ppp_start_profile()
a19 18
	local _ppp_profile _ppp_mode _ppp_nat

	_ppp_profile=$1

	# Check for ppp profile mode override.
	#
	eval _ppp_mode=\$ppp_${_ppp_profile}_mode
	if [ -z "$_ppp_mode" ]; then
		_ppp_mode=$ppp_mode
	fi

	# Check for ppp profile nat override.
	#
	eval _ppp_nat=\$ppp_${_ppp_profile}_nat
	if [ -z "$_ppp_nat" ]; then
		_ppp_nat=$ppp_nat
	fi

d22 4
a25 4
	if [ "${_ppp_mode}" != "ddial" -a "${_ppp_mode}" != "direct" \
		-a "${_ppp_mode}" != "dedicated" \
		-a "${_ppp_mode}" != "background" ]; then
		_ppp_mode="auto"
d28 1
a28 1
	rc_flags="-quiet -${_ppp_mode}"
d32 1
a32 1
	case ${_ppp_nat} in
d38 1
a38 22
	# Run!
	#
	su -m $ppp_user -c "$command ${rc_flags} ${_ppp_profile}"
}

ppp_start()
{
	local _ppp_profile _p

	_ppp_profile=$*
	if [ -z "${_ppp_profile}" ]; then
		_ppp_profile=$ppp_profile
	fi

	echo -n "Starting PPP profile:"

	for _p in $_ppp_profile; do
		echo -n " $_p"
		ppp_start_profile $_p
	done

	echo "."
a48 27
ppp_stop_profile() {
	local _ppp_profile

	_ppp_profile=$1

	/bin/pkill -f "^${command}.*[[:space:]]${_ppp_profile}\$" || \
		echo -n "(not running)"
}

ppp_stop() {
	local _ppp_profile _p

	_ppp_profile=$*
	if [ -z "${_ppp_profile}" ]; then
		_ppp_profile=$ppp_profile
	fi

	echo -n "Stopping PPP profile:"

	for _p in $_ppp_profile; do
		echo -n " $_p"
		ppp_stop_profile $_p
	done

	echo "."
}

d50 1
a50 1
run_rc_command $*
@


1.13.2.2
log
@Fix a stupid typo.

Reported by:	bz
@
text
@d21 1
a21 1
	local _ppp_profile _ppp_mode _ppp_nat _ppp_unit
a23 5
	_ppp_profile_cleaned=$1
	_punct=". - / +"
	for _punct_c in $_punct; do
		_ppp_profile_cleaned=`ltr ${_ppp_profile_cleaned} ${_punct_c} '_'`
	done
d27 1
a27 1
	eval _ppp_mode=\$ppp_${_ppp_profile_cleaned}_mode
d34 1
a34 1
	eval _ppp_nat=\$ppp_${_ppp_profile_cleaned}_nat
a56 6
	# Check for hard wired unit
	eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit
	if [ -n "${_ppp_unit}" ]; then
		_ppp_unit="-unit${_ppp_unit}"
	fi

@


1.13.2.3
log
@MFC rev 1.20:
Declare _ppp_profile_cleaned, _punct, and _punct_c local in
ppp_start_profile().

Reported by:	yar
@
text
@a21 1
	local _ppp_profile_cleaned _punct _punct_c
a66 1
	rc_flags="$rc_flags $_ppp_unit"
@


1.13.2.4
log
@SVN rev 211438 on 2010-08-17 21:28:40Z by jhb

MFC 175682,175683,175686:
Generally, anything that runs rc.d scripts internally should
start using the quiet prefix (i.e. quietstart, quietstop, etc...).
@
text
@d98 2
a99 2
	/etc/rc.d/ipfilter quietresync
	/etc/rc.d/pf quietresync
@


1.13.2.5
log
@SVN rev 231656 on 2012-02-14 10:17:30Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="ppp_enable"
@


1.13.2.6
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/7/etc/rc.d/ppp 231656 2012-02-14 10:17:30Z dougb $
@


1.13.2.4.2.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.13.2.4.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/ppp 211438 2010-08-17 21:28:40Z jhb $
@


1.13.2.3.6.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.13.2.3.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.13.2.3.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.12
log
@Re-sync'ing pf rules in post command as we already did for ipfilter.

With this patch, pf rules with dynamically created devices such like tun0
works without further intervention.

Reviewed by:	mlaier
MFC after:	3 days
@
text
@d15 2
a16 2
start_precmd="ppp_precmd"
start_postcmd="ppp_postcmd"
d18 1
a18 1
ppp_precmd()
d41 1
a41 1
ppp_postcmd()
@


1.11
log
@Transforming "ppp-user" into just "ppp", step 2:
This file has been repo-copied from src/etc/rc.d/ppp-user.
(Forced commit.)
@
text
@d43 1
a43 1
	# Re-Sync ipfilter so it picks up any new network interfaces
d46 1
@


1.11.2.1
log
@MFC:
Rename the rc.d script "ppp-user" to just "ppp".
@
text
@@


1.11.2.2
log
@MFC (1.12): Re-sync'ing pf rules in post command as we already did for
ipfilter.

Approved by:	re (kensmith)
@
text
@d43 1
a43 1
	# Re-Sync ipfilter and pf so they pick up any new network interfaces
a45 1
	/etc/rc.d/pf resync
@


1.11.2.3
log
@MFC: 1.13

date: 2007/03/31 09:03:38;  author: mtm;  state: Exp;  lines: +4 -4
Make subroutine names more conformant with other scripts in rc.d.
@
text
@d15 2
a16 2
start_precmd="ppp_prestart"
start_postcmd="ppp_poststart"
d18 1
a18 1
ppp_prestart()
d41 1
a41 1
ppp_poststart()
@


1.11.2.4
log
@MFC: etc/rc.d/ppp,v1.14 and etc/defaults/rc.conf,v1.319

Teach /etc/rc.d/ppp to start multiple instances of ppp.

ppp_profile variable can now contain multiple profiles.
Overrides for ppp mode and nat can go into ppp_$profile_mode
and ppp_$profile_nat variables respectively. If those are
not specified, defaults from ppp_mode and ppp_nat are used.

MFC: etc/rc.d/ppp v1.15

Teach /etc/rc.d/ppp how to start/stop individual instances
of ppp. This is an extension of previous commit.

Submitted by:	Yuri Kurenkov < y dot kurenkov at init dot ru >
Reviewed by:	mtm
Approved by:	re (kensmith)
@
text
@d15 1
a15 2
start_cmd="ppp_start"
stop_cmd="ppp_stop"
d18 1
a18 1
ppp_start_profile()
a19 18
	local _ppp_profile _ppp_mode _ppp_nat

	_ppp_profile=$1

	# Check for ppp profile mode override.
	#
	eval _ppp_mode=\$ppp_${_ppp_profile}_mode
	if [ -z "$_ppp_mode" ]; then
		_ppp_mode=$ppp_mode
	fi

	# Check for ppp profile nat override.
	#
	eval _ppp_nat=\$ppp_${_ppp_profile}_nat
	if [ -z "$_ppp_nat" ]; then
		_ppp_nat=$ppp_nat
	fi

d22 4
a25 4
	if [ "${_ppp_mode}" != "ddial" -a "${_ppp_mode}" != "direct" \
		-a "${_ppp_mode}" != "dedicated" \
		-a "${_ppp_mode}" != "background" ]; then
		_ppp_mode="auto"
d28 1
a28 1
	rc_flags="-quiet -${_ppp_mode}"
d32 1
a32 1
	case ${_ppp_nat} in
d38 1
a38 22
	# Run!
	#
	su -m $ppp_user -c "$command ${rc_flags} ${_ppp_profile}"
}

ppp_start()
{
	local _ppp_profile _p

	_ppp_profile=$*
	if [ -z "${_ppp_profile}" ]; then
		_ppp_profile=$ppp_profile
	fi

	echo -n "Starting PPP profile:"

	for _p in $_ppp_profile; do
		echo -n " $_p"
		ppp_start_profile $_p
	done

	echo "."
a48 27
ppp_stop_profile() {
	local _ppp_profile

	_ppp_profile=$1

	/bin/pkill -f "^${command}.*[[:space:]]${_ppp_profile}\$" || \
		echo -n "(not running)"
}

ppp_stop() {
	local _ppp_profile _p

	_ppp_profile=$*
	if [ -z "${_ppp_profile}" ]; then
		_ppp_profile=$ppp_profile
	fi

	echo -n "Stopping PPP profile:"

	for _p in $_ppp_profile; do
		echo -n " $_p"
		ppp_stop_profile $_p
	done

	echo "."
}

d50 1
a50 1
run_rc_command $*
@


1.11.2.5
log
@MFC revs 1.17-1.20, the functional components of which are:

1.17:
Allow the characters .-+/ to appear in ppp profile names by folding them
to _ when evaluating ppp_<profile>_nat and ppp_<profile>_mode.  Document
the per-profile variables.

1.18:
Add support for hardwiring ppp sessions to particular devices with new
per-profile variables of the form ppp_<profile>_unit.  No ppp_unit
variable is supported since tying the same unit to more than one profile
won't work.

PR:		conf/121452, conf/122127
@
text
@d21 1
a21 2
	local _ppp_profile _ppp_mode _ppp_nat _ppp_unit
	local _ppp_profile_cleaned _punct _punct_c
a23 5
	_ppp_profile_cleaned=$1
	_punct=". - / +"
	for _punct_c in $_punct; do
		_ppp_profile_cleaned=`ltr ${_ppp_profile_cleaned} ${_punct_c} '_'`
	done
d27 1
a27 1
	eval _ppp_mode=\$ppp_${_ppp_profile_cleaned}_mode
d34 1
a34 1
	eval _ppp_nat=\$ppp_${_ppp_profile_cleaned}_nat
a56 7
	# Check for hard wired unit
	eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit
	if [ -n "${_ppp_unit}" ]; then
		_ppp_unit="-unit${_ppp_unit}"
	fi
	rc_flags="$rc_flags $_ppp_unit"

@


1.11.2.6
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/ppp 178230 2008-04-15 22:37:43Z brooks $
@


1.11.2.5.2.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.10
log
@Use:

	command="/path/to/${name}"

since it's applicable here.  It's the current style of rc.d.

Pointed out by:	pjd
@
text
@@


1.9
log
@Transforming "ppp-user" into just "ppp", step 1:
The rcorder(8) condition PROVIDE'd by the script
and REQUIRE'd by the others becomes "ppp".

The ultimate goal of the transformation is to reduce
confusion resulting from the fact that $name has been
"ppp" already.

Discussed with: pjd, -rc
@
text
@d14 1
a14 1
command="/usr/sbin/ppp"
@


1.8
log
@Don't be lazy, set the "command" variable even if
/etc/defaults/rc.conf will provide foo_program, too.
By specifying "command" we explicitly say that we're
going to rely on rc.subr(8) default methods, and
rc.subr(8) will take advantage of this soon.

The majority of our rc.d scripts already set "command"
if appropriate, so fix just the non-compliant handful.
@
text
@d6 1
a6 1
# PROVIDE: ppp-user
@


1.7
log
@Use rc.subr

PR:		72505
Submitted by:	Amir Shalem <amir@@active.ath.cx>
@
text
@d14 1
@


1.6
log
@Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
@
text
@d13 3
a15 3
rcvar="ppp_enable"
start_cmd="ppp_start"
stop_cmd=":"
d17 1
a17 1
ppp_start()
d27 1
a27 1
	ppp_command="/usr/sbin/ppp -quiet -${ppp_mode}"
d33 1
a33 1
		ppp_command="${ppp_command} -nat"
d37 2
a38 4
	ppp_command="${ppp_command} ${ppp_profile}"

	echo "Starting ppp as \"${ppp_user}\""
	su -m ${ppp_user} -c "exec ${ppp_command}"
d40 2
@


1.5
log
@Mark scripts as not usable inside a jail by adding keyword 'nojail'.

Some suggestions from:	rwatson, Ruben de Groot <mail25@@bzerk.org>
@
text
@d8 1
a8 1
# KEYWORD: FreeBSD nojail
@


1.5.2.1
log
@RCS file: /home/ncvs/src/etc/rc,v
----------------------------
revision 1.335
date: 2004/10/08 14:23:49;  author: mtm;  state: Exp;  lines: +0 -1
Remove an unused variable.

Submitted by: Pawel Worach <pawel.worach@@telia.com>
----------------------------
revision 1.334
date: 2004/10/07 13:55:25;  author: mtm;  state: Exp;  lines: +1 -1
Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
=============================================================================
RCS file: /home/ncvs/src/etc/rc.d/nsswitch,v
----------------------------
revision 1.4
date: 2004/09/16 17:03:12;  author: keramida;  state: Exp;  lines: +1 -1
Fix requirement of `network' to `NETWORK' because the former isn't
provided by any rc.d script.

Approved by:	mtm
=============================================================================
RCS file: /home/ncvs/src/etc/rc.d/pflog,v
----------------------------
revision 1.3
date: 2004/09/16 17:04:20;  author: keramida;  state: Exp;  lines: +1 -1
We don't have any providers of `beforenetlkm' in FreeBSD.  Remove the
dependency to it from our rc.d scripts.

Approved by:	mtm
=============================================================================

Approved by: re/scottl
@
text
@d8 1
a8 1
# KEYWORD: nojail
@


1.4
log
@o Hook the new files up to the build.
o Make sure all the scripts reference rc.d/netif and not rc.d/network1

Approved by:	markm (mentor)
@
text
@d8 1
a8 1
# KEYWORD: FreeBSD
@


1.3
log
@Start isdnd before ppp for those folks who use ppp-over-isdn.

Approved by: markm (mentor)
@
text
@d7 1
a7 1
# REQUIRE: network1 isdnd
@


1.2
log
@Fix style bugs:
* Space -> tabs conversion.
* Removed blanks before semicolon in "if ... ; then".
* Proper indentation of misindented lines.
* Put a full stop after some comments.
* Removed whitespace at end of line.

Approved by:	silence from gordon
@
text
@d7 1
a7 1
# REQUIRE: network1
@


1.1
log
@Merge in all the changes that Mike Makonnen has been maintaining for a
while. This is only the script pieces, the glue for the build comes next.

Submitted by:	Mike Makonnen <makonnen@@pacbell.net>
Reviewed by:	silence on -current and -hackers
Prodded by:	rwatson
@
text
@d22 3
a24 3
	    -a "${ppp_mode}" != "dedicated" \
	    -a "${ppp_mode}" != "background" ]; then
	    ppp_mode="auto"
@

