head	1.13;
access;
symbols
	RELENG_8_4:1.11.0.2
	RELENG_9_1_0_RELEASE:1.8.2.2.2.2
	RELENG_9_1:1.8.2.2.0.2
	RELENG_9_1_BP:1.8.2.2
	RELENG_8_3_0_RELEASE:1.7.10.3.2.1
	RELENG_8_3:1.7.10.3.0.2
	RELENG_8_3_BP:1.7.10.3
	RELENG_9_0_0_RELEASE:1.8.2.1.2.1
	RELENG_9_0:1.8.2.1.0.2
	RELENG_9_0_BP:1.8.2.1
	RELENG_9:1.8.0.2
	RELENG_9_BP:1.8
	RELENG_7_4_0_RELEASE:1.7.14.1
	RELENG_8_2_0_RELEASE:1.7.10.1.6.1
	RELENG_7_4:1.7.0.14
	RELENG_7_4_BP:1.7
	RELENG_8_2:1.7.10.1.0.6
	RELENG_8_2_BP:1.7.10.1
	RELENG_8_1_0_RELEASE:1.7.10.1.4.1
	RELENG_8_1:1.7.10.1.0.4
	RELENG_8_1_BP:1.7.10.1
	RELENG_7_3_0_RELEASE:1.7.12.1
	RELENG_7_3:1.7.0.12
	RELENG_7_3_BP:1.7
	RELENG_8_0_0_RELEASE:1.7.10.1.2.1
	RELENG_8_0:1.7.10.1.0.2
	RELENG_8_0_BP:1.7.10.1
	RELENG_8:1.7.0.10
	RELENG_8_BP:1.7
	RELENG_7_2_0_RELEASE:1.7.8.1
	RELENG_7_2:1.7.0.8
	RELENG_7_2_BP:1.7
	RELENG_7_1_0_RELEASE:1.7.6.1
	RELENG_6_4_0_RELEASE:1.4.2.2.4.1
	RELENG_7_1:1.7.0.6
	RELENG_7_1_BP:1.7
	RELENG_6_4:1.4.2.2.0.4
	RELENG_6_4_BP:1.4.2.2
	RELENG_7_0_0_RELEASE:1.7
	RELENG_6_3_0_RELEASE:1.4.2.2
	RELENG_7_0:1.7.0.4
	RELENG_7_0_BP:1.7
	RELENG_6_3:1.4.2.2.0.2
	RELENG_6_3_BP:1.4.2.2
	RELENG_7:1.7.0.2
	RELENG_7_BP:1.7
	RELENG_6_2_0_RELEASE:1.4.2.1
	RELENG_6_2:1.4.2.1.0.4
	RELENG_6_2_BP:1.4.2.1
	RELENG_5_5_0_RELEASE:1.3.2.1
	RELENG_5_5:1.3.2.1.0.6
	RELENG_5_5_BP:1.3.2.1
	RELENG_6_1_0_RELEASE:1.4.2.1
	RELENG_6_1:1.4.2.1.0.2
	RELENG_6_1_BP:1.4.2.1
	RELENG_6_0_0_RELEASE:1.4
	RELENG_6_0:1.4.0.4
	RELENG_6_0_BP:1.4
	RELENG_6:1.4.0.2
	RELENG_6_BP:1.4
	RELENG_5_4_0_RELEASE:1.3.2.1
	RELENG_5_4:1.3.2.1.0.4
	RELENG_5_4_BP:1.3.2.1
	RELENG_5_3_0_RELEASE:1.3.2.1
	RELENG_5_3:1.3.2.1.0.2
	RELENG_5_3_BP:1.3.2.1
	RELENG_5:1.3.0.2
	RELENG_5_BP:1.3
	RELENG_5_2_1_RELEASE:1.2
	RELENG_5_2_0_RELEASE:1.2
	RELENG_5_2:1.2.0.6
	RELENG_5_2_BP:1.2
	RELENG_5_1_0_RELEASE:1.2
	RELENG_5_1:1.2.0.4
	RELENG_5_1_BP:1.2
	RELENG_5_0_0_RELEASE:1.2
	RELENG_5_0:1.2.0.2
	RELENG_5_0_BP:1.2;
locks; strict;
comment	@# @;


1.13
date	2013.06.28.00.28.40;	author svnexp;	state Exp;
branches;
next	1.12;

1.12
date	2013.06.13.00.36.49;	author svnexp;	state Exp;
branches;
next	1.11;

1.11
date	2012.11.17.01.49.04;	author svnexp;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2012.09.11.05.04.59;	author obrien;	state Exp;
branches;
next	1.9;

1.9
date	2012.02.11.06.21.16;	author dougb;	state Exp;
branches;
next	1.8;

1.8
date	2009.09.12.22.13.41;	author hrs;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2007.04.02.22.53.07;	author des;	state Exp;
branches
	1.7.2.1
	1.7.6.1
	1.7.8.1
	1.7.10.1
	1.7.12.1
	1.7.14.1;
next	1.6;

1.6
date	2006.01.17.19.29.31;	author philip;	state Exp;
branches;
next	1.5;

1.5
date	2006.01.16.13.26.05;	author philip;	state Exp;
branches;
next	1.4;

1.4
date	2004.10.07.13.55.25;	author mtm;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2004.03.08.12.25.05;	author pjd;	state Exp;
branches
	1.3.2.1;
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.11.2.1
date	2012.11.17.01.49.04;	author svnexp;	state dead;
branches;
next	1.11.2.2;

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

1.8.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.8.2.1.2.1;
next	1.8.2.2;

1.8.2.2
date	2012.02.14.10.33.57;	author dougb;	state Exp;
branches
	1.8.2.2.2.1;
next	1.8.2.3;

1.8.2.3
date	2012.10.26.18.06.49;	author obrien;	state Exp;
branches;
next	1.8.2.4;

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

1.8.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.8.2.1.2.2;

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

1.8.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.8.2.2.2.2;

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

1.7.2.1
date	2012.02.14.10.34.27;	author dougb;	state Exp;
branches;
next	1.7.2.2;

1.7.2.2
date	2012.11.17.08.01.20;	author svnexp;	state Exp;
branches;
next	;

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

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

1.7.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.7.10.1.2.1
	1.7.10.1.4.1
	1.7.10.1.6.1;
next	1.7.10.2;

1.7.10.2
date	2012.02.10.10.18.30;	author dougb;	state Exp;
branches;
next	1.7.10.3;

1.7.10.3
date	2012.02.14.10.34.15;	author dougb;	state Exp;
branches
	1.7.10.3.2.1;
next	1.7.10.4;

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

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

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

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

1.7.10.3.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.7.10.3.2.2;

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

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

1.7.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.7.14.2;

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

1.4.2.1
date	2006.01.20.14.24.34;	author matteo;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	2007.05.24.16.14.37;	author des;	state Exp;
branches
	1.4.2.2.4.1;
next	1.4.2.3;

1.4.2.3
date	2012.11.17.07.39.06;	author svnexp;	state Exp;
branches;
next	;

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

1.3.2.1
date	2004.10.10.09.50.53;	author mtm;	state Exp;
branches;
next	;


desc
@@


1.13
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252310
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@#!/bin/sh
#
# Add additional swap files
#
# $FreeBSD: head/etc/rc.d/addswap 252310 2013-06-27 18:28:45Z hrs $
#

# PROVIDE: addswap
# REQUIRE: FILESYSTEMS kld
# BEFORE:  netif
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="addswap"
start_cmd=":"
stop_cmd=":"
rcvar=

set_rcvar_obsolete swapfile
set_rcvar_obsolete geli_swap_flags

load_rc_config $name
run_rc_command "$1"
@


1.12
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251660
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d5 1
a5 1
# $FreeBSD: head/etc/rc.d/addswap 251660 2013-06-12 16:44:17Z crees $
d16 3
a18 2
start_cmd="addswap_start"
stop_cmd="addswap_stop"
d20 2
a21 48
addswap_start()
{
	case ${swapfile} in
	[Nn][Oo] | '')
		;;
	*)
		if [ -w "${swapfile}" ]; then
			check_startmsgs && echo "Adding ${swapfile} as additional swap"

			if [ -n "${swapfile_mdunit}" ]; then
				mdev="/dev/md${swapfile_mdunit#md}"
				mdconfig -a -t vnode -f "${swapfile}" -u ${swapfile_mdunit}
			else
				mdev="/dev/`mdconfig -a -t vnode -f "${swapfile}"`"
			fi

			if [ $? -eq 0 ]; then
				swapon ${mdev}
			else
				echo "error creating swapfile device"
			fi
		fi
		;;
	esac
}

addswap_stop()
{
	case ${swapfile} in
	[Nn][Oo] | '')
		;;
	*)
		if [ -n "${swapfile_mdunit}" ]; then
			mdev="/dev/md${swapfile_mdunit#md}"
		else
			mdev="/dev/`mdconfig -lv | grep "${swapfile}" | cut -f1`"
			swapfile_mdunit=${mdev#md}
		fi
		if [ -n "${swapfile_mdunit}" ]; then
			swapctl -l | grep -q ${mdev}
			if [ $? -eq 0 ]; then
				echo "Dismounting swapfile ${swapfile}"
				swapoff ${mdev} && mdconfig -d -u ${swapfile_mdunit}
			fi
		fi
		;;
	esac
}
@


1.11
log
@Switching exporter and resync
@
text
@d5 1
a5 1
# $FreeBSD: head/etc/rc.d/addswap 240336 2012-09-11 05:04:59Z obrien $
d11 1
a11 1
# KEYWORD: nojail
d17 1
a17 1
stop_cmd=":"
d26 37
a62 2
			echo "Adding ${swapfile} as additional swap"
			mdev=`mdconfig -a -t vnode -f ${swapfile}` && swapon /dev/${mdev}
@


1.11.2.1
log
@file addswap was added on branch RELENG_8_4 on 2013-03-28 13:02:43 +0000
@
text
@d1 34
@


1.11.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 33
#!/bin/sh
#
# Add additional swap files
#
# $FreeBSD: releng/8.4/etc/rc.d/addswap 231665 2012-02-14 10:34:15Z dougb $
#

# PROVIDE: addswap
# REQUIRE: FILESYSTEMS kld
# KEYWORD: nojail

. /etc/rc.subr

name="addswap"
start_cmd="addswap_start"
stop_cmd=":"

addswap_start()
{
	case ${swapfile} in
	[Nn][Oo] | '')
		;;
	*)
		if [ -w "${swapfile}" ]; then
			echo "Adding ${swapfile} as additional swap"
			mdev=`mdconfig -a -t vnode -f ${swapfile}` && swapon /dev/${mdev}
		fi
		;;
	esac
}

load_rc_config $name
run_rc_command "$1"
@


1.10
log
@SVN rev 240336 on 2012-09-11 05:04:59Z by obrien

Simply things so that "#REQUIRE: FILESYSTEMS" means the file
systems are fully "ready to go".

'FILESYSTEMS' states: "This is a dummy dependency, for services which
require file systems to be mounted before starting."  However, we have
'var' which is was run after 'FILESYSTEMS' and can mount /var if it
already isn't mounted.  Furthermore, several scripts cannot use /var
until 'cleanvar' has done its thing.  Thus "FILESYSTEMS" hasn't really
meant all critical file systems are fully usable.
@
text
@d5 1
a5 1
# $FreeBSD$
@


1.9
log
@SVN rev 231507 on 2012-02-11 06:21:16Z by dougb

In the days before r208307 addswap was running early in the second stage
of rcorder. Somehow in the intervening period addswap got moved to the
very end, which is almost certainly not what we want.

This change moves it to right after kld so that for users who need it,
they'll get it ASAP.
@
text
@d10 1
@


1.8
log
@SVN rev 197139 on 2009-09-12 22:13:41Z by hrs

Integrate rc.d/network_ipv6 into rc.d/netif:

- Add rc.d/stf and rc.d/faith for stf(4) and faith(4).
- Remove rc.d/auto_linklocal and rc.d/network_ipv6.
- Move rc.d/sysctl to just before FILESYSTEMS because rc.d/netif
  depends on some sysctl variables.

Reviewed by:	brooks
MFC after:	3 days
@
text
@d9 1
a9 1
# REQUIRE: FILESYSTEMS
@


1.8.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.8.2.2
log
@SVN rev 231664 on 2012-02-14 10:33:57Z by dougb

MFC r231507:

Move addswap to run right after kld (aka early in the second stage),
as it did previously.
@
text
@d9 1
a9 1
# REQUIRE: FILESYSTEMS kld
@


1.8.2.3
log
@SVN rev 242153 on 2012-10-26 18:06:49Z by obrien

MFC: r240336:
  Simply things so that "#REQUIRE: FILESYSTEMS" means the file
  systems are fully "ready to go".

  'FILESYSTEMS' states: "This is a dummy dependency, for services which
  require file systems to be mounted before starting."  However, we have
  'var' which is was run after 'FILESYSTEMS' and can mount /var if it
  already isn't mounted.  Furthermore, several scripts cannot use /var
  until 'cleanvar' has done its thing.  Thus "FILESYSTEMS" hasn't really
  meant all critical file systems are fully usable.
@
text
@a9 1
# BEFORE:  netif
@


1.8.2.4
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
@d5 1
a5 1
# $FreeBSD: stable/9/etc/rc.d/addswap 242153 2012-10-26 18:06:49Z obrien $
@


1.8.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.8.2.2.2.2
log
@Switch importer
@
text
@d5 1
a5 1
# $FreeBSD: releng/9.1/etc/rc.d/addswap 231664 2012-02-14 10:33:57Z dougb $
@


1.8.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.8.2.1.2.2
log
@Switch importer
@
text
@d5 1
a5 1
# $FreeBSD: releng/9.0/etc/rc.d/addswap 197139 2009-09-12 22:13:41Z hrs $
@


1.7
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
@a9 1
# BEFORE: sysctl
@


1.7.2.1
log
@SVN rev 231666 on 2012-02-14 10:34:27Z by dougb

MFC r231507:

Move addswap to run right after kld (aka early in the second stage),
as it did previously.
@
text
@d9 1
a9 1
# REQUIRE: FILESYSTEMS kld
@


1.7.2.2
log
@Switch importer
@
text
@d5 1
a5 1
# $FreeBSD: stable/7/etc/rc.d/addswap 231666 2012-02-14 10:34:27Z dougb $
@


1.7.14.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.7.14.2
log
@Switch importer
@
text
@d5 1
a5 1
# $FreeBSD: releng/7.4/etc/rc.d/addswap 168283 2007-04-02 22:53:07Z des $
@


1.7.12.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.7.10.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.7.10.2
log
@SVN rev 231372 on 2012-02-10 10:18:30Z by dougb

MFC r208307:

This change does the following for the scripts that run up through
FILESYSTEMS (the default early_late_divider):
1. Move sysctl to run first
2. Move as many BEFOREs to REQUIREs as possible.
3. Minor effect, move hostid_save from right before mdconfig to right
   after.

A lot of the early scripts make use of sysctl one way or another so
running this first makes a lot of sense given that system-critical
values are often placed in sysctl.conf. (More details in original log.)

In addition to the changes from this revision, tweak a few other rcorder
elements in order to minimize the differences between the order before
and after this change, mostly related to scripts still in this branch
that are no longer in HEAD.
@
text
@d10 1
@


1.7.10.3
log
@SVN rev 231665 on 2012-02-14 10:34:15Z by dougb

MFC r231507:

Move addswap to run right after kld (aka early in the second stage),
as it did previously.
@
text
@d9 1
a9 1
# REQUIRE: FILESYSTEMS kld
@


1.7.10.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
@d5 1
a5 1
# $FreeBSD: stable/8/etc/rc.d/addswap 231665 2012-02-14 10:34:15Z dougb $
@


1.7.10.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.7.10.3.2.2
log
@Switch importer
@
text
@d5 1
a5 1
# $FreeBSD: releng/8.3/etc/rc.d/addswap 231665 2012-02-14 10:34:15Z dougb $
@


1.7.10.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.7.10.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.7.10.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.7.8.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.7.6.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.6
log
@Remove the module loading magic again; it's not needed after all.

Pointy hat to:	matteo
Submitted by:	matteo
Reviewed by:	pjd
MFC after:	3 days
@
text
@d9 1
a9 1
# REQUIRE: mountcritlocal
@


1.5
log
@Load the g_md kernel module if needed.

Pointed out by:	Gianmarco Giovannelli
Submitted by:	matteo
MFC after:	3 days
@
text
@a25 8
			if ! kldstat -q -m g_md ; then
				if kldload g_md ; then
					info 'g_md module loaded.'
				else
					warn 'g_md module failed to load.'
					return 1
				fi
			fi
@


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

Discussed with: dougb, brooks
MFC after: 3 days
@
text
@d25 9
a33 1
		if [ -w "${swapfile}" -a -c /dev/mdctl ]; then
@


1.4.2.1
log
@MFC:  don't check for /dev/mdctl and let mdconfig load the module if needed

Approved by:	philip
@
text
@d25 1
a25 1
		if [ -w "${swapfile}" ]; then
@


1.4.2.2
log
@MFC: add FILESYSTEMS
@
text
@d9 1
a9 1
# REQUIRE: FILESYSTEMS
@


1.4.2.3
log
@Switch importer
@
text
@d5 1
a5 1
# $FreeBSD: stable/6/etc/rc.d/addswap 169945 2007-05-24 16:14:37Z des $
@


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

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


1.3.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
@d11 1
a11 1
# KEYWORD: nojail
@


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
@d11 1
a11 1
# KEYWORD: FreeBSD
@


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
@d27 1
a27 1
		 	mdev=`mdconfig -a -t vnode -f ${swapfile}` && swapon /dev/${mdev}
@

