head	1.23;
access;
symbols
	RELENG_8_4:1.23.0.2
	RELENG_9_1_0_RELEASE:1.21.2.2.2.2
	RELENG_9_1:1.21.2.2.0.2
	RELENG_9_1_BP:1.21.2.2
	RELENG_8_3_0_RELEASE:1.20.2.3.2.1
	RELENG_8_3:1.20.2.3.0.2
	RELENG_8_3_BP:1.20.2.3
	RELENG_9_0_0_RELEASE:1.21.2.1.2.1
	RELENG_9_0:1.21.2.1.0.2
	RELENG_9_0_BP:1.21.2.1
	RELENG_9:1.21.0.2
	RELENG_9_BP:1.21
	RELENG_7_4_0_RELEASE:1.19.2.2.4.1
	RELENG_8_2_0_RELEASE:1.20.2.2.6.1
	RELENG_7_4:1.19.2.2.0.4
	RELENG_7_4_BP:1.19.2.2
	RELENG_8_2:1.20.2.2.0.6
	RELENG_8_2_BP:1.20.2.2
	RELENG_8_1_0_RELEASE:1.20.2.2.4.1
	RELENG_8_1:1.20.2.2.0.4
	RELENG_8_1_BP:1.20.2.2
	RELENG_7_3_0_RELEASE:1.19.2.2.2.1
	RELENG_7_3:1.19.2.2.0.2
	RELENG_7_3_BP:1.19.2.2
	RELENG_8_0_0_RELEASE:1.20.2.2.2.1
	RELENG_8_0:1.20.2.2.0.2
	RELENG_8_0_BP:1.20.2.2
	RELENG_8:1.20.0.2
	RELENG_8_BP:1.20
	RELENG_7_2_0_RELEASE:1.19.2.1.4.1
	RELENG_7_2:1.19.2.1.0.4
	RELENG_7_2_BP:1.19.2.1
	RELENG_7_1_0_RELEASE:1.19.2.1.2.1
	RELENG_6_4_0_RELEASE:1.11.2.5.2.1
	RELENG_7_1:1.19.2.1.0.2
	RELENG_7_1_BP:1.19.2.1
	RELENG_6_4:1.11.2.5.0.2
	RELENG_6_4_BP:1.11.2.5
	RELENG_7_0_0_RELEASE:1.19.4.1
	RELENG_6_3_0_RELEASE:1.11.2.4
	RELENG_7_0:1.19.0.4
	RELENG_7_0_BP:1.19
	RELENG_6_3:1.11.2.4.0.2
	RELENG_6_3_BP:1.11.2.4
	RELENG_7:1.19.0.2
	RELENG_7_BP:1.19
	RELENG_6_2_0_RELEASE:1.11.2.2
	RELENG_6_2:1.11.2.2.0.4
	RELENG_6_2_BP:1.11.2.2
	RELENG_5_5_0_RELEASE:1.10.2.1
	RELENG_5_5:1.10.2.1.0.6
	RELENG_5_5_BP:1.10.2.1
	RELENG_6_1_0_RELEASE:1.11.2.2
	RELENG_6_1:1.11.2.2.0.2
	RELENG_6_1_BP:1.11.2.2
	RELENG_6_0_0_RELEASE:1.11
	RELENG_6_0:1.11.0.4
	RELENG_6_0_BP:1.11
	RELENG_6:1.11.0.2
	RELENG_6_BP:1.11
	RELENG_5_4_0_RELEASE:1.10.2.1
	RELENG_5_4:1.10.2.1.0.4
	RELENG_5_4_BP:1.10.2.1
	RELENG_5_3_0_RELEASE:1.10.2.1
	RELENG_5_3:1.10.2.1.0.2
	RELENG_5_3_BP:1.10.2.1
	RELENG_5:1.10.0.2
	RELENG_5_BP:1.10
	RELENG_5_2_1_RELEASE:1.6
	RELENG_5_2_0_RELEASE:1.6
	RELENG_5_2:1.6.0.2
	RELENG_5_2_BP:1.6
	RELENG_5_1_0_RELEASE:1.5
	RELENG_5_1:1.5.0.2
	RELENG_5_1_BP:1.5
	RELENG_5_0_0_RELEASE:1.4
	RELENG_5_0:1.4.0.2
	RELENG_5_0_BP:1.4
	head_20020621:1.1.1.2
	head_20010615:1.1.1.1
	NETBSD:1.1.1;
locks; strict;
comment	@# @;


1.23
date	2012.11.17.01.49.04;	author svnexp;	state Exp;
branches
	1.23.2.1;
next	1.22;

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

1.21
date	2009.08.23.05.56.54;	author dougb;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2007.12.08.07.20.22;	author dougb;	state Exp;
branches
	1.20.2.1;
next	1.19;

1.19
date	2007.05.18.12.04.41;	author mtm;	state Exp;
branches
	1.19.2.1
	1.19.4.1;
next	1.18;

1.18
date	2007.04.09.08.53.40;	author des;	state Exp;
branches;
next	1.17;

1.17
date	2007.04.02.22.53.07;	author des;	state Exp;
branches;
next	1.16;

1.16
date	2006.01.24.15.16.55;	author pjd;	state Exp;
branches;
next	1.15;

1.15
date	2006.01.24.15.12.44;	author pjd;	state Exp;
branches;
next	1.14;

1.14
date	2006.01.24.15.11.11;	author pjd;	state Exp;
branches;
next	1.13;

1.13
date	2005.10.12.22.14.44;	author pjd;	state Exp;
branches;
next	1.12;

1.12
date	2005.10.12.21.40.40;	author pjd;	state Exp;
branches;
next	1.11;

1.11
date	2004.10.07.13.55.26;	author mtm;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2004.03.08.12.25.05;	author pjd;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2004.03.05.07.43.38;	author mtm;	state Exp;
branches;
next	1.8;

1.8
date	2004.01.17.10.40.45;	author mtm;	state Exp;
branches;
next	1.7;

1.7
date	2004.01.17.10.16.38;	author mtm;	state Exp;
branches;
next	1.6;

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

1.5
date	2003.02.16.20.46.08;	author mtm;	state Exp;
branches;
next	1.4;

1.4
date	2002.09.06.16.18.05;	author gordon;	state Exp;
branches;
next	1.3;

1.3
date	2002.07.31.16.39.19;	author ume;	state Exp;
branches;
next	1.2;

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

1.1
date	2001.06.16.07.16.14;	author obrien;	state Exp;
branches
	1.1.1.1;
next	;

1.23.2.1
date	2012.11.17.01.49.04;	author svnexp;	state dead;
branches;
next	1.23.2.2;

1.23.2.2
date	2013.03.28.13.02.43;	author svnexp;	state Exp;
branches;
next	;

1.21.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.21.2.1.2.1;
next	1.21.2.2;

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

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

1.21.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.21.2.1.2.2;

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

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

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

1.20.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches;
next	1.20.2.2;

1.20.2.2
date	2009.10.14.03.31.37;	author dougb;	state Exp;
branches
	1.20.2.2.2.1
	1.20.2.2.4.1
	1.20.2.2.6.1;
next	1.20.2.3;

1.20.2.3
date	2012.02.14.10.17.14;	author dougb;	state Exp;
branches
	1.20.2.3.2.1;
next	1.20.2.4;

1.20.2.4
date	2012.11.17.10.35.56;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.20.2.3.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.20.2.3.2.2;

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

1.19.2.1
date	2008.01.28.07.55.44;	author dougb;	state Exp;
branches
	1.19.2.1.2.1
	1.19.2.1.4.1;
next	1.19.2.2;

1.19.2.2
date	2009.10.14.03.35.15;	author dougb;	state Exp;
branches
	1.19.2.2.2.1
	1.19.2.2.4.1;
next	1.19.2.3;

1.19.2.3
date	2012.02.14.10.17.30;	author dougb;	state Exp;
branches;
next	1.19.2.4;

1.19.2.4
date	2012.11.17.08.01.21;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.19.2.2.4.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.19.2.2.4.2;

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

1.19.4.1
date	2008.01.28.07.58.31;	author dougb;	state Exp;
branches;
next	;

1.11.2.1
date	2005.12.15.23.30.10;	author pjd;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2006.01.31.00.28.01;	author pjd;	state Exp;
branches;
next	1.11.2.3;

1.11.2.3
date	2007.05.24.16.14.37;	author des;	state Exp;
branches;
next	1.11.2.4;

1.11.2.4
date	2007.10.25.14.04.18;	author mtm;	state Exp;
branches;
next	1.11.2.5;

1.11.2.5
date	2008.01.28.08.22.32;	author dougb;	state Exp;
branches
	1.11.2.5.2.1;
next	1.11.2.6;

1.11.2.6
date	2009.10.14.03.36.59;	author dougb;	state Exp;
branches;
next	1.11.2.7;

1.11.2.7
date	2012.11.17.07.39.07;	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.10.2.1
date	2004.10.10.09.50.53;	author mtm;	state Exp;
branches;
next	;

1.1.1.1
date	2001.06.16.07.16.14;	author obrien;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2002.06.21.19.07.21;	author obrien;	state Exp;
branches;
next	;


desc
@@


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

# PROVIDE: ipsec
# REQUIRE: FILESYSTEMS
# BEFORE:  DAEMON mountcritremote
# KEYWORD: nojail

. /etc/rc.subr

name="ipsec"
rcvar="ipsec_enable"
start_precmd="ipsec_prestart"
start_cmd="ipsec_start"
stop_precmd="test -f $ipsec_file"
stop_cmd="ipsec_stop"
reload_cmd="ipsec_reload"
extra_commands="reload"
ipsec_program="/sbin/setkey"
# ipsec_file is set by rc.conf

ipsec_prestart()
{
	if [ ! -f "$ipsec_file" ]; then
		warn "$ipsec_file not readable; ipsec start aborted."
		stop_boot
		return 1
	fi
	return 0
}

ipsec_start()
{
	echo "Installing ipsec manual keys/policies."
	${ipsec_program} -f $ipsec_file
}

ipsec_stop()
{
	echo "Clearing ipsec manual keys/policies."

	# Still not 100% sure if we would like to do this.
	# It is very questionable to do this during shutdown session
	# since it can hang any of the remaining IPv4/v6 sessions.
	#
	${ipsec_program} -F
	${ipsec_program} -FP
}

ipsec_reload()
{
	echo "Reloading ipsec manual keys/policies."
	${ipsec_program} -f "$ipsec_file"
}

load_rc_config $name
run_rc_command "$1"
@


1.23.2.1
log
@file ipsec was added on branch RELENG_8_4 on 2013-03-28 13:02:43 +0000
@
text
@d1 59
@


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

# PROVIDE: ipsec
# REQUIRE: FILESYSTEMS
# BEFORE:  DAEMON mountcritremote
# KEYWORD: nojail

. /etc/rc.subr

name="ipsec"
rcvar="ipsec_enable"
start_precmd="ipsec_prestart"
start_cmd="ipsec_start"
stop_precmd="test -f $ipsec_file"
stop_cmd="ipsec_stop"
reload_cmd="ipsec_reload"
extra_commands="reload"
ipsec_program="/sbin/setkey"
# ipsec_file is set by rc.conf

ipsec_prestart()
{
	if [ ! -f "$ipsec_file" ]; then
		warn "$ipsec_file not readable; ipsec start aborted."
		stop_boot
		return 1
	fi
	return 0
}

ipsec_start()
{
	echo "Installing ipsec manual keys/policies."
	${ipsec_program} -f $ipsec_file
}

ipsec_stop()
{
	echo "Clearing ipsec manual keys/policies."

	# Still not 100% sure if we would like to do this.
	# It is very questionable to do this during shutdown session
	# since it can hang any of the remaining IPv4/v6 sessions.
	#
	${ipsec_program} -F
	${ipsec_program} -FP
}

ipsec_reload()
{
	echo "Reloading ipsec manual keys/policies."
	${ipsec_program} -f "$ipsec_file"
}

load_rc_config $name
run_rc_command "$1"
@


1.22
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.21
log
@SVN rev 196439 on 2009-08-23 05:56:54Z by dougb

Fix the typo mentioned in the PR, and one additional.
Fix caps while I'm here.

PR:		conf/138087
Submitted by:	Chris Petrik <c.petrik.sosa@@gmail.com>
@
text
@d14 1
a14 1
rcvar=`set_rcvar`
@


1.21.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.21.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
@d14 1
a14 1
rcvar="ipsec_enable"
@


1.21.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/ipsec 231653 2012-02-14 10:16:56Z dougb $
@


1.21.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.21.2.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/ipsec 231653 2012-02-14 10:16:56Z dougb $
@


1.21.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.21.2.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/ipsec 196439 2009-08-23 05:56:54Z dougb $
@


1.20
log
@Remove $NetBSD$ CVS tags. We no longer attempt to synch our rc.d files
with theirs, so this information doesn't need to be in the live file.
Having it in our CVS history is enough.
@
text
@d44 3
a46 3
	# still not 100% sure if we would like to do this.
	# it is very questionable to do this during shutdown session, since
	# it can hang any of remaining IPv4/v6 session.
@


1.20.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.20.2.2
log
@SVN rev 198068 on 2009-10-14 03:31:37Z by dougb

MFC r196439:

Fix the typo mentioned in the PR, and one additional.
Fix caps while I'm here.

PR:		conf/138087
Submitted by:	Chris Petrik <c.petrik.sosa@@gmail.com>
Approved by:	re (kib)
@
text
@d44 3
a46 3
	# Still not 100% sure if we would like to do this.
	# It is very questionable to do this during shutdown session
	# since it can hang any of the remaining IPv4/v6 sessions.
@


1.20.2.3
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
@d14 1
a14 1
rcvar="ipsec_enable"
@


1.20.2.4
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/ipsec 231655 2012-02-14 10:17:14Z dougb $
@


1.20.2.3.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.20.2.3.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/ipsec 231655 2012-02-14 10:17:14Z dougb $
@


1.20.2.2.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.20.2.2.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.20.2.2.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.19
log
@o Implement the stop_boot subroutine [1]. This subroutine can be used by
  scripts in rc.d to stop rc(8) from booting into multi-user mode when
  a critical or severe error condition is encountered.

o Modify scripts in etc/rc.d that already implemented this functionality
  independently.

o Document it.

[1] - This subroutine was implemented in FreeBSD in rc.d/fsck. I moved it
      to rc.subr(8). Our version differs slightly in that it takes an
      optional argument to stop the boot even if "autoboot" is not set.

Obtained from: NetBSD
MFC after: 2 weeks
@
text
@a2 1
# $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $
@


1.19.4.1
log
@MFC the purely cosmetic changes, including removal of $NetBSD$ Ids,
a few spurious #'s, an empty REQUIRE, and a never-used KEYWORD.

Approved by:	re (kensmith)
@
text
@d3 1
@


1.19.2.1
log
@MFC the purely cosmetic changes, including removal of $NetBSD$ Ids,
a few spurious #'s, an empty REQUIRE, and a never-used KEYWORD.
@
text
@d3 1
@


1.19.2.2
log
@SVN rev 198069 on 2009-10-14 03:35:15Z by dougb

MFC r196439: typo and caps fixes
@
text
@d44 3
a46 3
	# Still not 100% sure if we would like to do this.
	# It is very questionable to do this during shutdown session
	# since it can hang any of the remaining IPv4/v6 sessions.
@


1.19.2.3
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
@d14 1
a14 1
rcvar="ipsec_enable"
@


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


1.19.2.2.4.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.19.2.2.4.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/ipsec 198069 2009-10-14 03:35:15Z dougb $
@


1.19.2.2.2.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.19.2.1.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.19.2.1.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.18
log
@FILESYSTEMS requires root, so requiring both of them is redundant.
@
text
@d29 1
a29 9
			#
			# If booting directly to multiuser, send SIGTERM to
			# the parent (/etc/rc) to abort the boot
			#
		if [ "$autoboot" = yes ]; then
			echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
			kill -TERM $$
			exit 1
		fi
@


1.17
log
@Add a dummy script, FILESYSTEMS, which depends on root and mountcritlocal
and takes over mountcritlocal's role as the early / late divider.  This
makes it far easier to add rc scripts which need to run early, such as a
startup script for zfs, which is right around the corner.

This change should be a no-op; I have verified that the only change in
rcorder's output is the insertion of FILESYSTEMS immediately after
mountcritlocal.

MFC after:	3 weeks
@
text
@d8 1
a8 1
# REQUIRE: root FILESYSTEMS
@


1.16
log
@The 'reload' command did the same as 'restart' command.
Allow user to decide if SAD and SPD entries should be flushed on 'reload'.
With this change flush/spdflush is not done automatically (it could still
be done from ipsec.conf).
@
text
@d8 1
a8 1
# REQUIRE: root mountcritlocal
@


1.15
log
@Remove stale comment.

This change should be made in rev1.9.

MFC after:	1 week
@
text
@a63 2
	${ipsec_program} -F
	${ipsec_program} -FP
@


1.14
log
@Use $ipsec_file instead of hardcoded /etc/ipsec.conf.

This change should be made in rev1.2.

MFC after:	1 week
@
text
@a11 2
#	it does not really require beforenetlkm.

@


1.13
log
@First start rc.d/ipsec and then rc.d/mountcritremote, so we can mount
NFS file system over IPsec.

Suggested by:	Tomasz Piat <tomasz.pilat@@axelspringer.pl>
@
text
@d20 1
a20 1
stop_precmd="test -f /etc/ipsec.conf"
@


1.12
log
@setkey(8) was repo-copied from usr.sbin/ to sbin/.
This will allow for NFS mount of /usr over IPsec.

Discussed on:	arch@@
@
text
@d9 1
a9 1
# BEFORE:  DAEMON
@


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

Discussed with: dougb, brooks
MFC after: 3 days
@
text
@d24 1
a24 1
ipsec_program="/usr/sbin/setkey"
@


1.11.2.1
log
@MFC:	Move setkey(8) from usr.sbin/ to sbin/ and make rc.d/ipsec to run
	before rc.d/mountcritremote, so it is possible to mount /usr/ over
	IPsec.

Discussed on:	arch@@
Suggested by:	Tomasz Piat <tomasz.pilat@@axelspringer.pl>
Prodded by:	dougb
@
text
@d9 1
a9 1
# BEFORE:  DAEMON mountcritremote
d24 1
a24 1
ipsec_program="/sbin/setkey"
@


1.11.2.2
log
@MFC:	etc/rc.d/ipsec	1.14,1.15

- Use $ipsec_file instead of hardcoded /etc/ipsec.conf.
- Remove stale comment.
@
text
@d12 2
d20 1
a20 1
stop_precmd="test -f $ipsec_file"
@


1.11.2.3
log
@MFC: add FILESYSTEMS
@
text
@d8 1
a8 1
# REQUIRE: root FILESYSTEMS
@


1.11.2.4
log
@MFC:
  o Implement the stop_boot subroutine [1]. This subroutine can be used by
    scripts in rc.d to stop rc(8) from booting into multi-user mode when
    a critical or severe error condition is encountered.

  o Modify scripts in etc/rc.d that already implemented this functionality
    independently.

  o Document it.

  [1] - This subroutine was implemented in FreeBSD in rc.d/fsck. I moved it
        to rc.subr(8). Our version differs slightly in that it takes an
        optional argument to stop the boot even if "autoboot" is not set.

  Obtained from: NetBSD
@
text
@d29 9
a37 1
		stop_boot
@


1.11.2.5
log
@MFC the purely cosmetic changes, including removal of $NetBSD$ Ids,
a few spurious #'s, an empty REQUIRE, and a never-used KEYWORD.
@
text
@d3 1
@


1.11.2.6
log
@SVN rev 198070 on 2009-10-14 03:36:59Z by dougb

MFC r196439: typo and caps fixes
@
text
@d44 3
a46 3
	# Still not 100% sure if we would like to do this.
	# It is very questionable to do this during shutdown session
	# since it can hang any of the remaining IPv4/v6 sessions.
@


1.11.2.7
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/ipsec 198070 2009-10-14 03:36:59Z dougb $
@


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
@Mark scripts as not usable inside a jail by adding keyword 'nojail'.

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


1.10.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
@d10 1
a10 1
# KEYWORD: nojail
@


1.9
log
@Remove scripts we don't use from requirement lines. These were
hold-overs from the initial NetBSD import.
@
text
@d10 1
a10 1
# KEYWORD: FreeBSD
@


1.8
log
@Luke Mewburn has indicated that they (NetBSD) are not interested
in keeping the scripts under rc.d in sync with us. So, remove
NetBSD specific stuff (which made our scripts more complicated
than necessary).

The NetBSD ident string will be left intact, both for history and
also incase we wish to pull in future versions.
@
text
@d8 1
a8 1
# REQUIRE: root beforenetlkm mountcritlocal
@


1.7
log
@Luke Mewburn has indicated that they (NetBSD) are not interested
in keeping the scripts under rc.d in sync with us. So, begin removal
of NetBSD specific stuff (which made our scripts more complicated
than necessary), starting with the NetBSD KEYWORD.
@
text
@d24 2
a25 11

case ${OSTYPE} in
FreeBSD)
	ipsec_program="/usr/sbin/setkey"
	# ipsec_file is set by rc.conf
	;;
NetBSD)
	ipsec_program="/sbin/setkey"
	ipsec_file="/etc/ipsec.conf"
	;;
esac
@


1.6
log
@tty whacking should occur early, but not so early that the
required commands are not on a mounted file system.

Noticed by: bde
@
text
@d10 1
a10 1
# KEYWORD: FreeBSD NetBSD
@


1.5
log
@We stopped reloading rc.conf for each script a long time ago. Things
shouldn't depend on that any more.

PR:		conf/48332
Approved by:	markm (mentor)(implicit)
@
text
@d8 1
a8 1
# REQUIRE: root beforenetlkm mountcritlocal tty
@


1.4
log
@Convert from `${CMD_OSTYPE}` to ${OSTYPE}. This saves a shell invocation on
OS-dependent case switches.
@
text
@a17 2
# This will be overiden from rc.conf on FreeBSD.
ipsec_file="/etc/ipsec.conf"
d28 1
d32 1
@


1.3
log
@FreeBSD has setkey in different location from NetBSD.

Submitted by:	Mike Makonnen <makonnen@@pacbell.net>
@
text
@d27 1
a27 1
case `${CMD_OSTYPE}` in
@


1.2
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
@d27 9
d57 1
a57 1
	/sbin/setkey -f $ipsec_file
d68 2
a69 2
	/sbin/setkey -F
	/sbin/setkey -FP
d75 3
a77 3
	/sbin/setkey -F
	/sbin/setkey -FP
	/sbin/setkey -f "$ipsec_file"
@


1.1
log
@Initial revision
@
text
@d3 2
a4 1
# $NetBSD: ipsec,v 1.5 2000/07/21 01:16:07 lukem Exp $
d9 2
d17 3
a19 1
rcvar=$name
d29 2
a30 2
	if [ ! -f /etc/ipsec.conf ]; then
		warn "/etc/ipsec.conf not readable; ipsec start aborted."
d48 1
a48 1
	/sbin/setkey -f /etc/ipsec.conf
d68 1
a68 1
	/sbin/setkey -f /etc/ipsec.conf
@


1.1.1.1
log
@Import the NetBSD 1.5 RC system.

Note that `rc' and `rc.shutdown' could not be imported because we already
have files with those names.
@
text
@@


1.1.1.2
log
@Sync with NetBSD's mainline.
@
text
@d3 1
a3 1
# $NetBSD: ipsec,v 1.6 2000/09/19 13:04:38 lukem Exp $
a7 1
# BEFORE:  DAEMON
@

