[src/netbsd-1-6]: src/etc/rc.d Pull up revision 1.7 (requested by is in ticke...

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

details:   https://anonhg.NetBSD.org/src/rev/ad5c483bd26c
branches:  netbsd-1-6
changeset: 530265:ad5c483bd26c
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Jun 15 13:07:57 2003 +0000

description:
Pull up revision 1.7 (requested by is in ticket #1242):
Variable substitution happens at trap installation time, not at trap
execution time - so it used to print "Using default configuration of
/etc/passwd".

diffstat:

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

diffs (20 lines):

diff -r 38301c9c352c -r ad5c483bd26c etc/rc.d/bootconf.sh
--- a/etc/rc.d/bootconf.sh      Sun Jun 15 13:02:54 2003 +0000
+++ b/etc/rc.d/bootconf.sh      Sun Jun 15 13:07:57 2003 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: bootconf.sh,v 1.5 2002/03/25 03:22:10 wiz Exp $
+# $NetBSD: bootconf.sh,v 1.5.2.1 2003/06/15 13:07:57 tron Exp $
 #
 
 # PROVIDE: bootconf
@@ -47,7 +47,7 @@
        _DUMMY=/etc/passwd
        conf=${_DUMMY}
        while [ ! -d /etc/etc.$conf/. ]; do
-               trap "conf=$default; echo; echo Using default of $conf" ALRM
+               trap "conf=$default; echo; echo Using default of $default" ALRM
                echo -n "Which configuration [$default] ? "
                (sleep 30 && kill -ALRM $master) >/dev/null 2>&1 &
                read conf