Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/distrib/miniroot/install.sub,v rcsdiff: /ftp/cvs/cvsroot/src/distrib/miniroot/install.sub,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.41.2.1 retrieving revision 1.42 diff -u -p -r1.41.2.1 -r1.42 --- src/distrib/miniroot/install.sub 2002/06/13 02:34:40 1.41.2.1 +++ src/distrib/miniroot/install.sub 2002/05/23 02:57:08 1.42 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: install.sub,v 1.41.2.1 2002/06/13 02:34:40 lukem Exp $ +# $NetBSD: install.sub,v 1.42 2002/05/23 02:57:08 nathanw Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -518,9 +518,6 @@ enable_network() { if [ -f /mnt/etc/rc.conf ]; then ( # assume network interface configuration style 1.2D and up - if [ -f /mnt/etc/defaults/rc.conf ]; then - . /mnt/etc/defaults/rc.conf - fi . /mnt/etc/rc.conf if [ "$net_interfaces" != NO ]; then @@ -1302,7 +1299,7 @@ get_timezone() { cat << \__get_timezone_1 Select a time zone for your location. Timezones are represented on the -system by a directory structure rooted in "/usr/share/timezone". Most +system by a directory structure rooted in "/usr/share/zoneinfo". Most timezones can be selected by entering a token like "MET" or "GMT-6". Other zones are grouped by continent, with detailed zone information separated by a slash ("/"), e.g. "US/Pacific".