[src/trunk]: src/etc/rc.d From Anon Ymous:

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a7224564d6f4
branches:  trunk
changeset: 758311:a7224564d6f4
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Nov 01 14:42:08 2010 +0000

description:
>From Anon Ymous:
Send the SIGALRM to the correct process when we timeout. See the note
in src/etc/rc regarding RC_PID.

The former code would leave you with a root shell when the prompt
timed out (if the tty is marked secure) while continuing the boot
process in another shell.  This was easily hidden if you started
xdm(1) at boot, while the root shell remains on another tty
(accessible with CTL-ALT-F1).

diffstat:

 etc/rc.d/bootconf.sh |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r eb473de846c0 -r a7224564d6f4 etc/rc.d/bootconf.sh
--- a/etc/rc.d/bootconf.sh      Mon Nov 01 14:41:11 2010 +0000
+++ b/etc/rc.d/bootconf.sh      Mon Nov 01 14:42:08 2010 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: bootconf.sh,v 1.13 2009/09/12 17:40:01 apb Exp $
+# $NetBSD: bootconf.sh,v 1.14 2010/11/01 14:42:08 christos Exp $
 #
 
 # PROVIDE: bootconf
@@ -50,13 +50,12 @@
                esac
        done
        echo
-       master=$$
        _DUMMY=/etc/passwd
        conf=${_DUMMY}
        while [ ! -d /etc/etc.$conf/. ]; do
                trap "conf=$default; echo; echo Using default of $default" ALRM
                echo -n "Which configuration [$default] ? "
-               (sleep 30 && kill -ALRM $master) >/dev/null 2>&1 &
+               (sleep 30 && kill -ALRM $RC_PID) >/dev/null 2>&1 &
                read conf
                trap : ALRM
                if [ -z $conf ] ; then