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

On Thu, Apr 05, 2007 at 09:32:57AM +0200, Alan Barrett wrote:
  | > Where is this documented, and what is the connection betwee ".sh" and
  | > "is capable of faulting autoboot and going to single-user"?
  |=20
  | It's documented in the the rc(8) man page.  Unfortunately, the
  | behaviour doesn't match the documentation.  I cooked up the appended
  | patch but haven't tested it.

The principle behind your change makes sense to me.
In the rc.8 change, maybe use .Fn (or something else appropriate)
for the markup of 'stop_boot()'.

If it works, commit it.


Regarding the separate issue of an rc.d script that returns non-zero
halting the entire boot process; I don't like that change, and offhand
I can't recall another implementation that functions this way;
a single buggy rc.d script shouldn't be able to halt the boot of the
system.



  | Index: etc/rc.subr
  | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
  | --- etc/rc.subr	27 Jan 2007 14:30:26 -0000	1.68
  | +++ etc/rc.subr	5 Apr 2007 07:29:07 -0000
  | @@ -39,6 +39,7 @@
  |  #
  | =20
  |  : ${rcvar_manpage:=3D'rc.conf(5)'}
  | +: ${RC_PID:=3D$$} ; export RC_PID
  | =20
  |  #
  |  #	functions
  | @@ -84,6 +85,20 @@
  |  }
  | =20
  |  #
  | +# If booting directly to multiuser, send SIGTERM to
  | +# the parent (/etc/rc) to abort the boot.
  | +# Otherwise just exit.
  | +#
  | +stop_boot()
  | +{
  | +	if [ "$autoboot" =3D yes ]; then
  | +		echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
  | +		kill -TERM ${RC_PID}
  | +	fi
  | +	exit 1
  | +}
  | +
  | +#
  |  # mount_critical_filesystems type
  |  #	Go through the list of critical filesystems as provided in
  |  #	the rc.conf(5) variable $critical_filesystems_${type}, checking
  | Index: etc/rc.d/fixsb
  | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
  | --- etc/rc.d/fixsb	30 Dec 2004 09:32:13 -0000	1.12
  | +++ etc/rc.d/fixsb	5 Apr 2007 07:29:07 -0000
  | @@ -127,16 +127,6 @@
  |  	done
  |  }
  | =20
  | -stop_boot()
  | -{
  | -	# Terminate the process (which may include the parent /etc/rc)
  | -	# if booting directly to multiuser mode.
  | -	if [ "$autoboot" =3D "yes" ]; then
  | -		kill -TERM $$
  | -	fi
  | -	exit 1
  | -}
  | -
  |  do_fsck()
  |  {
  |  	# During fsck ignore SIGQUIT
  | Index: etc/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
  | --- etc/rc.d/fsck	7 Oct 2006 04:11:23 -0000	1.6
  | +++ etc/rc.d/fsck	5 Apr 2007 07:29:07 -0000
  | @@ -12,17 +12,6 @@
  |  start_cmd=3D"fsck_start"
  |  stop_cmd=3D":"
  | =20
  | -stop_boot()
  | -{
  | -	#	Terminate the process (which may include the parent /etc/rc)
  | -	#	if booting directly to multiuser mode.
  | -	#
  | -	if [ "$autoboot" =3D yes ]; then
  | -		kill -TERM $$
  | -	fi
  | -	exit 1
  | -}
  | -
  |  fsck_start()
  |  {
  |  	if [ -e /fastboot ]; then
  | Index: etc/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
  | --- etc/rc.d/ipfilter	23 Dec 2004 03:31:54 -0000	1.14
  | +++ etc/rc.d/ipfilter	5 Apr 2007 07:29:07 -0000
  | @@ -27,14 +27,7 @@
  |  	if [ ! -f /etc/ipf.conf ] && [ ! -f /etc/ipf6.conf ]; then
  |  		warn "/etc/ipf*.conf not readable; ipfilter start aborted."
  | =20
  | -			# If booting directly to multiuser, send SIGTERM to
  | -			# the parent (/etc/rc) to abort the boot
  | -			#
  | -		if [ "$autoboot" =3D yes ]; then
  | -			echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
  | -			kill -TERM $$
  | -			exit 1
  | -		fi
  | +		stop_boot
  |  		return 1
  |  	fi
  |  	return 0
  | Index: etc/rc.d/ipsec
  | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
  | --- etc/rc.d/ipsec	13 Aug 2004 18:08:03 -0000	1.8
  | +++ etc/rc.d/ipsec	5 Apr 2007 07:29:07 -0000
  | @@ -24,15 +24,8 @@
  |  {
  |  	if [ ! -f /etc/ipsec.conf ]; then
  |  		warn "/etc/ipsec.conf not readable; ipsec start aborted."
  | -			#
  | -			# If booting directly to multiuser, send SIGTERM to
  | -			# the parent (/etc/rc) to abort the boot
  | -			#
  | -		if [ "$autoboot" =3D yes ]; then
  | -			echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
  | -			kill -TERM $$
  | -			exit 1
  | -		fi
  | +
  | +		stop_boot
  |  		return 1
  |  	fi
  |  	return 0
  | Index: etc/rc.d/pf
  | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
  | --- etc/rc.d/pf	23 Aug 2005 12:12:56 -0000	1.6
  | +++ etc/rc.d/pf	5 Apr 2007 07:29:07 -0000
  | @@ -23,13 +23,7 @@
  |  	if [ ! -f ${pf_rules} ]; then
  |  		warn "${pf_rules} not readable; pf start aborted."
  | =20
  | -		# If booting directly to multiuser, send SIGTERM to
  | -		# the parent (/etc/rc) to abort the boot
  | -		if [ "$autoboot" =3D yes ]; then
  | -			echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
  | -			kill -TERM $$
  | -			exit 1
  | -		fi
  | +		stop_boot
  |  		return 1
  |  	fi
  |  	return 0
  | Index: etc/rc.d/pf_boot
  | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
  | --- etc/rc.d/pf_boot	23 Aug 2005 12:12:56 -0000	1.1
  | +++ etc/rc.d/pf_boot	5 Apr 2007 07:29:07 -0000
  | @@ -26,8 +26,7 @@
  |  		/sbin/pfctl -q -f /etc/defaults/pf.boot.conf
  |  	else
  |  		warn "can't load initial pf rules; pf start aborted."
  | -		echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
  | -		kill -TERM $$
  | +		stop_boot
  |  		exit 1
  |  	fi
  | =20
  | Index: share/man/man8/rc.8
  | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
  | --- share/man/man8/rc.8	6 Jan 2004 14:46:11 -0000	1.28
  | +++ share/man/man8/rc.8	5 Apr 2007 07:29:07 -0000
  | @@ -219,16 +219,10 @@
  |  early in the boot.
  |  .It Pa bar
  |  Scripts that are sourced in a subshell.
  | -These can stop the boot if necessary with the following shell
  | -commands:
  | -.Bd -literal -offset
  | -	if [ "$autoboot" =3D yes ]; then
  | -		kill -TERM $$
  | -	fi
  | -	exit 1
  | -.Ed
  |  .Pp
  | -Note that this should be used extremely sparingly!
  | +The boot does not stop if such a script terminates with a non-zero sta=
tus,
  | +but a script can stop the boot if necessary by invoking the
  | +stop_boot() function.
  |  .El
  |  .Pp
  |  Each script should contain

--45Z9DzgjV8m4Oswq
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (NetBSD)

iD8DBQFGFhQcpBhtmn8zJHIRAnYCAJ0T0GWiXeYSdCYnSqow3WUMTC4zYwCfcURw
iZo/Lr1sG+j4IYbIyS8tYZo=
=xukj
-----END PGP SIGNATURE-----

--45Z9DzgjV8m4Oswq--