Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Jun 2005 17:55:33 -0700
From:      Brooks Davis <brooks@one-eyed-alien.net>
To:        Doug Barton <DougB@freebsd.org>
Cc:        freebsd-rc@freebsd.org, "J.R. Oldroyd" <fbsd@opal.com>
Subject:   Re: Use of rcorder for local rc.d/*.sh scripts
Message-ID:  <20050613005533.GA28966@odin.ac.hmc.edu>
In-Reply-To: <20050612121504.K844@ync.qbhto.arg>
References:  <20050607173741.GI11758@odin.ac.hmc.edu> <20050607191109.GU37208@linwhf.opal.com> <20050608233802.GA29707@odin.ac.hmc.edu> <20050609003459.GK37208@linwhf.opal.com> <20050609050517.GA28710@odin.ac.hmc.edu> <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg>

next in thread | previous in thread | raw e-mail | index | archive | help

--ZGiS0Q5IWpPtfppv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Jun 12, 2005 at 12:20:02PM -0700, Doug Barton wrote:
> Ok, here is a patch. Sorry it took so long to get to this, but real life=
=20
> interfered.
>=20
> I used JR's latest localpkg patch intact, and modified part of his rc pat=
ch=20
> to get that working. I'm not tied to either of the keywords I chose,=20
> bootearly and PORTS_RCORDER, so if someone has a better idea don't hesita=
te.
>=20
> To determine what to include in bootearly I used the extremely unscientif=
ic=20
> method of running rcorder the way it was pre-patch, and adding the keywor=
d=20
> to all the scripts  up to and including mountcritremote. This works in th=
e=20
> sense that it boots my system exactly the way that it did before, but som=
e=20
> more careful thought could probably be applied here by someone who knows=
=20
> the ins and outs of diskless booting (Brooks?).
>=20
> I'll let this sit till Monday, since re@ has indicated that they are=20
> flexible on some of these things, and I'd rather give you guys some time =
to=20
> review it.

I don't like the idea of tagging all the scripts.  First, it makes the
update suck.  We've done this sort of thing before with the FreeBSD
tag and it was really annoying given the number of machines I ended up
having to update (and users will definitly be doing the 5->6 upgrade
this time since it's quite easy unlike 4->5).  Second, that's a lot
places to keep state up to date.  JR's proposal of using a marker script
had the downside of adding slightly more code to /etc/rc, but the
advantage of not having to keep all the files in the right place.

The local_startup collector looks pretty good.  I'm not 100% how I feel
about the *.sample exception.  On one hand it seems like the safest
thing to do, on the other hand, it's the sort of feature that tends to
hang on forever.  I'd be slightly inclined to complain about .sample
scripts that are executable to try and get people to stop installing
them.  We should almost certainly complain about script that aren't *.sh
that are not executable.  Effectivly those will all be all port bugs.

-- Brooks

> +*)	local_rc=3D""
> +	for dir in ${local_startup}; do
> +		if [ -d "${dir}" ]; then
> +			for file in `grep -l PORTS_RCORDER ${dir}/*`; do
> +				case "$file" in
> +				*.sh|*.sample) ;;
> +				*)	if [ -x "$file" ]; then
> +						local_rc=3D"${local_rc} ${file}"
> +					fi
> +					;;
> +				esac
> +			done
> +		fi
> +	done
> +	;;
> +esac
> +
> +files=3D`rcorder ${skip} -s bootearly /etc/rc.d/* ${local_rc} 2>/dev/nul=
l`
> =20
>  for _rc_elem in ${files}; do
>  	run_rc_script ${_rc_elem} ${_boot}
> Index: rc.d/NETWORKING
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/NETWORKING,v
> retrieving revision 1.9
> diff -u -r1.9 NETWORKING
> --- rc.d/NETWORKING	7 Oct 2004 13:55:25 -0000	1.9
> +++ rc.d/NETWORKING	12 Jun 2005 19:10:22 -0000
> @@ -7,6 +7,7 @@
>  # PROVIDE: NETWORKING NETWORK
>  # REQUIRE: dhclient netif routing network_ipv6 isdnd ppp-user
>  # REQUIRE: routed mrouted route6d mroute6d
> +# KEYWORD: bootearly
> =20
>  #	This is a dummy dependency, for services which require networking
>  #	to be operational before starting.
> Index: rc.d/addswap
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/addswap,v
> retrieving revision 1.4
> diff -u -r1.4 addswap
> --- rc.d/addswap	7 Oct 2004 13:55:25 -0000	1.4
> +++ rc.d/addswap	12 Jun 2005 19:10:22 -0000
> @@ -8,7 +8,7 @@
>  # PROVIDE: addswap
>  # REQUIRE: mountcritlocal
>  # BEFORE: sysctl
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/adjkerntz
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/adjkerntz,v
> retrieving revision 1.5
> diff -u -r1.5 adjkerntz
> --- rc.d/adjkerntz	7 Oct 2004 13:55:25 -0000	1.5
> +++ rc.d/adjkerntz	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
>  # PROVIDE: adjkerntz
>  # REQUIRE: mountcritlocal random
>  # BEFORE: netif
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/atm1
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/atm1,v
> retrieving revision 1.15
> diff -u -r1.15 atm1
> --- rc.d/atm1	7 Oct 2004 13:55:25 -0000	1.15
> +++ rc.d/atm1	12 Jun 2005 19:10:22 -0000
> @@ -30,7 +30,7 @@
>  # PROVIDE: atm1
>  # REQUIRE: root
>  # BEFORE: netif
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/atm2
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/atm2,v
> retrieving revision 1.16
> diff -u -r1.16 atm2
> --- rc.d/atm2	7 Oct 2004 13:55:25 -0000	1.16
> +++ rc.d/atm2	12 Jun 2005 19:10:22 -0000
> @@ -30,7 +30,7 @@
>  # PROVIDE: atm2
>  # REQUIRE: atm1 netif
>  # BEFORE:  routing
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  #
>  # Additional ATM interface configuration
> Index: rc.d/ccd
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/ccd,v
> retrieving revision 1.5
> diff -u -r1.5 ccd
> --- rc.d/ccd	7 Oct 2004 13:55:25 -0000	1.5
> +++ rc.d/ccd	12 Jun 2005 19:10:22 -0000
> @@ -5,7 +5,7 @@
>  #
> =20
>  # PROVIDE: disks
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/cleanvar
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/cleanvar,v
> retrieving revision 1.8
> diff -u -r1.8 cleanvar
> --- rc.d/cleanvar	14 Apr 2005 03:56:06 -0000	1.8
> +++ rc.d/cleanvar	12 Jun 2005 19:10:22 -0000
> @@ -5,6 +5,7 @@
> =20
>  # PROVIDE: cleanvar
>  # REQUIRE: mountcritlocal var
> +# KEYWORD: bootearly
> =20
>  purgedir()
>  {
> Index: rc.d/devd
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/devd,v
> retrieving revision 1.7
> diff -u -r1.7 devd
> --- rc.d/devd	7 Oct 2004 13:55:25 -0000	1.7
> +++ rc.d/devd	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
>  # PROVIDE: devd
>  # REQUIRE: NETWORKING
>  # BEFORE: mountcritremote
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/dumpon
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/dumpon,v
> retrieving revision 1.9
> diff -u -r1.9 dumpon
> --- rc.d/dumpon	7 Jun 2005 15:20:10 -0000	1.9
> +++ rc.d/dumpon	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
>  # PROVIDE: dumpon
>  # REQUIRE: rcconf
>  # BEFORE: disks savecore initrandom
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/early.sh
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/early.sh,v
> retrieving revision 1.2
> diff -u -r1.2 early.sh
> --- rc.d/early.sh	7 Oct 2004 13:55:25 -0000	1.2
> +++ rc.d/early.sh	12 Jun 2005 19:10:22 -0000
> @@ -6,6 +6,7 @@
>  # PROVIDE: early
>  # REQUIRE: disks localswap
>  # BEFORE:  fsck
> +# KEYWORD: bootearly
> =20
>  #
>  # Support for legacy /etc/rc.early script
> Index: rc.d/fsck
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/fsck,v
> retrieving revision 1.10
> diff -u -r1.10 fsck
> --- rc.d/fsck	7 Oct 2004 13:55:25 -0000	1.10
> +++ rc.d/fsck	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
> =20
>  # PROVIDE: fsck
>  # REQUIRE: localswap
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/gbde
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/gbde,v
> retrieving revision 1.12
> diff -u -r1.12 gbde
> --- rc.d/gbde	30 Jan 2005 11:04:13 -0000	1.12
> +++ rc.d/gbde	12 Jun 2005 19:10:22 -0000
> @@ -7,7 +7,7 @@
>  #
> =20
>  # PROVIDE: disks
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/gbde_swap
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/gbde_swap,v
> retrieving revision 1.6
> diff -u -r1.6 gbde_swap
> --- rc.d/gbde_swap	7 Oct 2004 13:55:25 -0000	1.6
> +++ rc.d/gbde_swap	12 Jun 2005 19:10:22 -0000
> @@ -5,7 +5,7 @@
> =20
>  # PROVIDE: disks
>  # REQUIRE: initrandom
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/hostname
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/hostname,v
> retrieving revision 1.8
> diff -u -r1.8 hostname
> --- rc.d/hostname	7 Oct 2004 13:55:25 -0000	1.8
> +++ rc.d/hostname	12 Jun 2005 19:10:22 -0000
> @@ -29,6 +29,7 @@
>  # PROVIDE: hostname
>  # REQUIRE: mountcritlocal
>  # BEFORE:  netif
> +# KEYWORD: bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/initrandom
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/initrandom,v
> retrieving revision 1.5
> diff -u -r1.5 initrandom
> --- rc.d/initrandom	2 Mar 2005 19:03:08 -0000	1.5
> +++ rc.d/initrandom	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
>  # PROVIDE: initrandom
>  # REQUIRE: rcconf
>  # BEFORE: disks
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/ip6addrctl
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/ip6addrctl,v
> retrieving revision 1.4
> diff -u -r1.4 ip6addrctl
> --- rc.d/ip6addrctl	7 Oct 2004 13:55:26 -0000	1.4
> +++ rc.d/ip6addrctl	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
>  # PROVIDE: ip6addrctl
>  # REQUIRE: mountcritlocal netif
>  # BEFORE: network_ipv6
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/ip6fw
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/ip6fw,v
> retrieving revision 1.6
> diff -u -r1.6 ip6fw
> --- rc.d/ip6fw	7 Oct 2004 13:55:26 -0000	1.6
> +++ rc.d/ip6fw	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
>  # PROVIDE: ip6fw
>  # REQUIRE: routing
>  # BEFORE: network_ipv6
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/ipfilter
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/ipfilter,v
> retrieving revision 1.22
> diff -u -r1.22 ipfilter
> --- rc.d/ipfilter	7 Oct 2004 13:55:26 -0000	1.22
> +++ rc.d/ipfilter	12 Jun 2005 19:10:22 -0000
> @@ -7,7 +7,7 @@
>  # PROVIDE: ipfilter
>  # REQUIRE: root mountcritlocal
>  # BEFORE:  netif
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/ipfs
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/ipfs,v
> retrieving revision 1.6
> diff -u -r1.6 ipfs
> --- rc.d/ipfs	7 Oct 2004 13:55:26 -0000	1.6
> +++ rc.d/ipfs	12 Jun 2005 19:10:22 -0000
> @@ -7,7 +7,7 @@
>  # PROVIDE: ipfs
>  # REQUIRE: ipnat
>  # BEFORE:  netif
> -# KEYWORD: nojail shutdown
> +# KEYWORD: nojail shutdown bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/ipfw
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/ipfw,v
> retrieving revision 1.10
> diff -u -r1.10 ipfw
> --- rc.d/ipfw	16 Mar 2005 08:47:48 -0000	1.10
> +++ rc.d/ipfw	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
>  # PROVIDE: ipfw
>  # REQUIRE: ppp-user
>  # BEFORE: NETWORKING
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
>  . /etc/network.subr
> Index: rc.d/ipnat
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/ipnat,v
> retrieving revision 1.14
> diff -u -r1.14 ipnat
> --- rc.d/ipnat	7 Oct 2004 13:55:26 -0000	1.14
> +++ rc.d/ipnat	12 Jun 2005 19:10:22 -0000
> @@ -7,7 +7,7 @@
>  # PROVIDE: ipnat
>  # REQUIRE: ipfilter
>  # BEFORE:  DAEMON netif
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/isdnd
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/isdnd,v
> retrieving revision 1.20
> diff -u -r1.20 isdnd
> --- rc.d/isdnd	16 Jan 2005 03:12:03 -0000	1.20
> +++ rc.d/isdnd	12 Jun 2005 19:10:22 -0000
> @@ -8,7 +8,7 @@
> =20
>  # PROVIDE: isdnd
>  # REQUIRE: netif mountcritlocal cleanvar
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/kldxref
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/kldxref,v
> retrieving revision 1.4
> diff -u -r1.4 kldxref
> --- rc.d/kldxref	7 Oct 2004 13:55:26 -0000	1.4
> +++ rc.d/kldxref	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
>  # PROVIDE: kldxref
>  # REQUIRE: root mountcritlocal
>  # BEFORE:  netif
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/localpkg
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/localpkg,v
> retrieving revision 1.5
> diff -u -r1.5 localpkg
> --- rc.d/localpkg	7 Oct 2004 13:55:26 -0000	1.5
> +++ rc.d/localpkg	12 Jun 2005 19:10:22 -0000
> @@ -14,6 +14,9 @@
>  start_cmd=3D"pkg_start"
>  stop_cmd=3D"pkg_stop"
> =20
> +rcorder_opts=3D""
> +[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && rcorder_opts=3D"-s n=
ojail"
> +
>  pkg_start()
>  {
>  	# For each dir in $local_startup, search for init scripts matching *.sh
> @@ -24,19 +27,14 @@
>  	*)
>  		echo -n 'Local package initialization:'
>  		slist=3D""
> -		if [ -z "${script_name_sep}" ]; then
> -			script_name_sep=3D" "
> -		fi
> +		zlist=3D""
>  		for dir in ${local_startup}; do
>  			if [ -d "${dir}" ]; then
> -				for script in ${dir}/*.sh; do
> -					slist=3D"${slist}${script_name_sep}${script}"
> -				done
> +				slist=3D"${slist} ${dir}/[^0-9]*.sh"
> +				zlist=3D"${zlist} ${dir}/[0-9]*.sh"
>  			fi
>  		done
> -		script_save_sep=3D"$IFS"
> -		IFS=3D"${script_name_sep}"
> -		for script in ${slist}; do
> +		for script in ${zlist} `rcorder -s nostart ${rcorder_opts} ${slist} 2>=
/dev/null`; do
>  			if [ -x "${script}" ]; then
>  				(set -T
>  				trap 'exit 1' 2
> @@ -45,7 +43,6 @@
>  				echo -n " (skipping ${script##*/}, not executable)"
>  			fi
>  		done
> -		IFS=3D"${script_save_sep}"
>  		echo '.'
>  		;;
>  	esac
> @@ -61,26 +58,20 @@
>  		;;
>  	*)
>  		slist=3D""
> -		if [ -z "${script_name_sep}" ]; then
> -			script_name_sep=3D" "
> -		fi
> +		zlist=3D""
>  		for dir in ${local_startup}; do
>  			if [ -d "${dir}" ]; then
> -				for script in ${dir}/*.sh; do
> -					slist=3D"${slist}${script_name_sep}${script}"
> -				done
> +				slist=3D"${slist} ${dir}/[^0-9]*.sh"
> +				zlist=3D"${zlist} ${dir}/[0-9]*.sh"
>  			fi
>  		done
> -		script_save_sep=3D"$IFS"
> -		IFS=3D"${script_name_sep}"
> -		for script in `reverse_list ${slist}`; do
> +		for script in `reverse_list ${zlist} \`rcorder -k shutdown ${rcorder_o=
pts} ${slist} 2>/dev/null\``; do
>  			if [ -x "${script}" ]; then
>  				(set -T
>  				trap 'exit 1' 2
>  				${script} stop)
>  			fi
>  		done
> -		IFS=3D"${script_save_sep}"
>  		echo '.'
>  		;;
>  	esac
> Index: rc.d/mountcritlocal
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/mountcritlocal,v
> retrieving revision 1.12
> diff -u -r1.12 mountcritlocal
> --- rc.d/mountcritlocal	7 Oct 2004 13:55:26 -0000	1.12
> +++ rc.d/mountcritlocal	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
> =20
>  # PROVIDE: mountcritlocal
>  # REQUIRE: root
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/mountcritremote
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/mountcritremote,v
> retrieving revision 1.11
> diff -u -r1.11 mountcritremote
> --- rc.d/mountcritremote	16 Jan 2005 03:12:03 -0000	1.11
> +++ rc.d/mountcritremote	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
> =20
>  # PROVIDE: mountcritremote
>  # REQUIRE: NETWORKING root mountcritlocal cleanvar
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/mroute6d
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/mroute6d,v
> retrieving revision 1.4
> diff -u -r1.4 mroute6d
> --- rc.d/mroute6d	7 Oct 2004 13:55:26 -0000	1.4
> +++ rc.d/mroute6d	12 Jun 2005 19:10:22 -0000
> @@ -5,7 +5,7 @@
> =20
>  # PROVIDE: mroute6d
>  # REQUIRE: network_ipv6
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/mrouted
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/mrouted,v
> retrieving revision 1.9
> diff -u -r1.9 mrouted
> --- rc.d/mrouted	16 Jan 2005 03:12:03 -0000	1.9
> +++ rc.d/mrouted	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
> =20
>  # PROVIDE: mrouted
>  # REQUIRE: netif routing cleanvar
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/netif
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/netif,v
> retrieving revision 1.13
> diff -u -r1.13 netif
> --- rc.d/netif	7 Jun 2005 04:49:12 -0000	1.13
> +++ rc.d/netif	12 Jun 2005 19:10:22 -0000
> @@ -27,7 +27,7 @@
> =20
>  # PROVIDE: netif
>  # REQUIRE: atm1 ipfilter mountcritlocal pccard serial sppp sysctl
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
>  . /etc/network.subr
> Index: rc.d/network_ipv6
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/network_ipv6,v
> retrieving revision 1.37
> diff -u -r1.37 network_ipv6
> --- rc.d/network_ipv6	7 Oct 2004 13:55:26 -0000	1.37
> +++ rc.d/network_ipv6	12 Jun 2005 19:10:22 -0000
> @@ -30,7 +30,7 @@
> =20
>  # PROVIDE: network_ipv6
>  # REQUIRE: routing
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
>  . /etc/network.subr
> Index: rc.d/nsswitch
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/nsswitch,v
> retrieving revision 1.5
> diff -u -r1.5 nsswitch
> --- rc.d/nsswitch	7 Oct 2004 13:55:26 -0000	1.5
> +++ rc.d/nsswitch	12 Jun 2005 19:10:22 -0000
> @@ -29,6 +29,7 @@
>  # PROVIDE: nsswitch
>  # REQUIRE: root
>  # BEFORE:  NETWORK
> +# KEYWORD: bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/pccard
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/pccard,v
> retrieving revision 1.30
> diff -u -r1.30 pccard
> --- rc.d/pccard	7 Oct 2004 13:55:26 -0000	1.30
> +++ rc.d/pccard	12 Jun 2005 19:10:22 -0000
> @@ -29,7 +29,7 @@
> =20
>  # PROVIDE: pccard
>  # REQUIRE: mountcritlocal
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/ppp-user
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/ppp-user,v
> retrieving revision 1.7
> diff -u -r1.7 ppp-user
> --- rc.d/ppp-user	15 Dec 2004 12:39:28 -0000	1.7
> +++ rc.d/ppp-user	12 Jun 2005 19:10:22 -0000
> @@ -5,7 +5,7 @@
> =20
>  # PROVIDE: ppp-user
>  # REQUIRE: netif isdnd
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/ramdisk
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/ramdisk,v
> retrieving revision 1.4
> diff -u -r1.4 ramdisk
> --- rc.d/ramdisk	7 Oct 2004 13:55:26 -0000	1.4
> +++ rc.d/ramdisk	12 Jun 2005 19:10:22 -0000
> @@ -30,6 +30,7 @@
>  # PROVIDE: ramdisk
>  # REQUIRE: localswap
>  # BEFORE: mountcritlocal
> +# KEYWORD: bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/random
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/random,v
> retrieving revision 1.8
> diff -u -r1.8 random
> --- rc.d/random	11 Apr 2005 02:45:05 -0000	1.8
> +++ rc.d/random	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
>  # PROVIDE: random
>  # REQUIRE: var initrandom
>  # BEFORE: netif
> -# KEYWORD: nojail shutdown
> +# KEYWORD: nojail shutdown bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/rcconf.sh
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/rcconf.sh,v
> retrieving revision 1.4
> diff -u -r1.4 rcconf.sh
> --- rc.d/rcconf.sh	29 Apr 2005 23:02:56 -0000	1.4
> +++ rc.d/rcconf.sh	12 Jun 2005 19:10:22 -0000
> @@ -5,6 +5,7 @@
> =20
>  # PROVIDE: rcconf
>  # BEFORE:  disks initrandom
> +# KEYWORD: bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/root
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/root,v
> retrieving revision 1.10
> diff -u -r1.10 root
> --- rc.d/root	7 Oct 2004 13:55:26 -0000	1.10
> +++ rc.d/root	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
> =20
>  # PROVIDE: root
>  # REQUIRE: fsck
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/route6d
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/route6d,v
> retrieving revision 1.9
> diff -u -r1.9 route6d
> --- rc.d/route6d	7 Oct 2004 13:55:26 -0000	1.9
> +++ rc.d/route6d	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
> =20
>  # PROVIDE: route6d
>  # REQUIRE: network_ipv6
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/routed
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/routed,v
> retrieving revision 1.12
> diff -u -r1.12 routed
> --- rc.d/routed	7 Oct 2004 13:55:26 -0000	1.12
> +++ rc.d/routed	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
> =20
>  # PROVIDE: routed
>  # REQUIRE: netif routing
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/routing
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/routing,v
> retrieving revision 1.141
> diff -u -r1.141 routing
> --- rc.d/routing	7 Oct 2004 13:55:26 -0000	1.141
> +++ rc.d/routing	12 Jun 2005 19:10:22 -0000
> @@ -7,7 +7,7 @@
> =20
>  # PROVIDE: routing
>  # REQUIRE: netif ppp-user
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/serial
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/serial,v
> retrieving revision 1.24
> diff -u -r1.24 serial
> --- rc.d/serial	14 Nov 2004 19:51:34 -0000	1.24
> +++ rc.d/serial	12 Jun 2005 19:10:22 -0000
> @@ -29,7 +29,7 @@
> =20
>  # PROVIDE: serial
>  # REQUIRE: root
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  # Change some defaults for serial devices.
>  # Standard defaults are:
> Index: rc.d/sppp
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/sppp,v
> retrieving revision 1.4
> diff -u -r1.4 sppp
> --- rc.d/sppp	7 Oct 2004 13:55:26 -0000	1.4
> +++ rc.d/sppp	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
>  # PROVIDE: sppp
>  # REQUIRE: root
>  # BEFORE: netif
> -# KEYWORD: nojail
> +# KEYWORD: nojail bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/swap1
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/swap1,v
> retrieving revision 1.9
> diff -u -r1.9 swap1
> --- rc.d/swap1	5 Nov 2004 12:38:27 -0000	1.9
> +++ rc.d/swap1	12 Jun 2005 19:10:22 -0000
> @@ -6,7 +6,7 @@
> =20
>  # PROVIDE: localswap
>  # REQUIRE: disks
> -# KEYWORD: nojail shutdown
> +# KEYWORD: nojail shutdown bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/sysctl
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/sysctl,v
> retrieving revision 1.16
> diff -u -r1.16 sysctl
> --- rc.d/sysctl	7 Oct 2004 13:55:26 -0000	1.16
> +++ rc.d/sysctl	12 Jun 2005 19:10:22 -0000
> @@ -7,6 +7,7 @@
>  # PROVIDE: sysctl
>  # REQUIRE: root
>  # BEFORE:  DAEMON
> +# KEYWORD: bootearly
> =20
>  . /etc/rc.subr
> =20
> Index: rc.d/var
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/etc/rc.d/var,v
> retrieving revision 1.40
> diff -u -r1.40 var
> --- rc.d/var	2 Mar 2005 16:41:35 -0000	1.40
> +++ rc.d/var	12 Jun 2005 19:10:22 -0000
> @@ -29,6 +29,7 @@
> =20
>  # PROVIDE: var
>  # REQUIRE: mountcritlocal
> +# KEYWORD: bootearly
> =20
>  . /etc/rc.subr
> =20

--=20
Any statement of the form "X is the one, true Y" is FALSE.
PGP fingerprint 655D 519C 26A7 82E7 2529  9BF0 5D8E 8BE9 F238 1AD4

--ZGiS0Q5IWpPtfppv
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQFCrNmEXY6L6fI4GtQRAu7XAJ4t8UrP9lkz+MiNjcMOt39AYYFMOACgprzf
uRXeS3VFLu/5ODq3AOlFh/8=
=3+hC
-----END PGP SIGNATURE-----

--ZGiS0Q5IWpPtfppv--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050613005533.GA28966>