 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: etcupdate,v 1.46 2008/09/14 14:22:45 apb Exp $
+# $NetBSD: etcupdate,v 1.47 2008/10/04 08:07:38 apb Exp $
+#
 # Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Martti Kuparinen.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -562,26 +562,30 @@ if ! ${CONTINUE}; then
 			echo "*** ERROR: Unable to find ${SRCDIR}/etc/Makefile"
 			exit 1
 		fi
 		set_makeenv
 		echo "*** Populating ${TEMPROOT} from ${SRCDIR} (make distribution)"
 		cd ${SRCDIR}/etc
 		if ! ${VERBOSE}; then
 			eval "${MAKE_ENV} make distribution > /dev/null"
 		else
 			eval "${MAKE_ENV} make distribution"
 		fi
 		[ $? -ne 0 ] && exit 1
 	fi
 	if ! [ -f "${TEMPROOT}/etc/mtree/set.etc" ]; then
 		echo "*** ERROR: Files from the etc.tgz set are missing"
 		exit 1
 	fi
 	if [ ! -f "${TEMPROOT}/dev/MAKEDEV" ]; then
 		echo ""
 		echo "*** WARNING: ${TEMPROOT}/dev/MAKEDEV not found"
 		echo "Make sure you update /dev/MAKEDEV later and run"
 		echo "(cd /dev && ./MAKEDEV all) to rebuild the device nodes"
 		echo ""
 	fi
 	# Ignore the following files during comparision
 	rm -f "${TEMPROOT}"/etc/passwd
 	rm -f "${TEMPROOT}"/etc/pwd.db
 	rm -f "${TEMPROOT}"/etc/spwd.db
 	find "${TEMPROOT}" -type f -size 0 -exec rm {} \;

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: etcupdate.8,v 1.17 2008/09/14 14:22:45 apb Exp $
+.\"	$NetBSD: etcupdate.8,v 1.18 2008/10/04 08:07:38 apb Exp $
 .\"
 .\" Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Martti Kuparinen.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -17,27 +17,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 5, 2008
+.Dd October 4, 2008
 .Dt ETCUPDATE 8
 .Os
 .Sh NAME
 .Nm etcupdate
 .Nd update the configuration and startup files in
 .Pa /etc
 .Sh SYNOPSIS
 .Nm
 .Op Fl ahlv
 .Op Fl p Ar pager
 .Op Fl s Brq Ar srcdir | Ar tgzdir | Ar tgzfile
 .Op Fl t Ar temproot
 .Op Fl w Ar width
 @@ -179,52 +179,60 @@ in the
 directory.
 Note that
 .Ar srcdir
 should refer to the top of the source directory tree;
 earlier versions of
 .Nm
 expected
 .Ar srcdir
 to refer to the
 .Pa etc
 subdirectory within the source tree.
 .It Fl s Ar tgzdir
 A directory in which reference files have been
-extracted from one or more of the
+extracted from a binary distribution of
 .Nx .
 The files that are distributed in the
 .Dq Pa etc.tgz
-or
+set file must be present.
 The files that are distributed in the
 .Dq Pa xetc.tgz
-files from a binary distribution of
+set file are optional.
 .Nx .
 The reference files from the specified directory will be copied to the
 .Pa temproot
 directory.
 .It Fl s Ar tgzfile
 The location of a set file
 (or
 .Dq "tgz file" )
 such as
-.Pa etc.tgz
+.Dq Pa etc.tgz
 or
-.Pa xetc.tgz
+.Dq Pa xetc.tgz
 from a binary distribution of
 .Nx .
 Each set file is a compressed archive containing reference files,
 which will be extracted to the
 .Pa temproot
 directory.
 Multiple
 .Fl s
 options may be used to specify multiple set files.
 The
 .Dq Pa etc.tgz
 set file must be specified.
 The
 .Dq Pa xetc.tgz
 set file is optional.
 .El
 .It Fl t Ar temproot
 Specifies the location of the
 .Pa temproot
 directory.
 This directory will be used for a temporary copy of
 the reference files created by running
 .Dq "make distribution"
 in the source directory specified by
 .Fl s Ar srcdir ,
 or a temporary copy of the reference files extracted from
 the binary sets specified by
 .Fl s Ar tgzfile ,

 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: postinstall,v 1.70 2008/09/21 06:20:07 junyoung Exp $
+# $NetBSD: postinstall,v 1.71 2008/10/04 08:07:38 apb Exp $
+#
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Luke Mewburn.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -1302,47 +1302,55 @@ list()
 		printf "  %-12s  %s\n" "${i}" "${desc}"
 	done
+}
 main()
+{
 	TGZLIST=		# quoted list list of tgz files
 	SRC_ARGLIST=		# quoted list of one or more "-s" args
 	N_SRC_ARGS=0		# number of "-s" args
 	TGZMODE=false		# true if "-s" specifies a tgz file
 	DIRMODE=false		# true if "-s" specified a directory
 	SOURCEMODE=false	# true if "-s" specified a source directory
 	while getopts s:d:m:a: ch; do
 		case "${ch}" in
 		s)
 			qarg="$(shell_quote "${OPTARG}")"
 			N_SRC_ARGS=$(( $N_SRC_ARGS + 1 ))
 			SRC_ARGLIST="${SRC_ARGLIST}${SRC_ARGLIST:+ }-s ${qarg}"
 			if [ -f "${OPTARG}" ]; then
 				# arg refers to a *.tgz file.
 				# This may happen twice, for both
 				# etc.tgz and xetc.tgz, so we build up a
 				# quoted list in TGZLIST.
 				TGZMODE=true
 				TGZLIST="${TGZLIST}${TGZLIST:+ }${qarg}"
 				# Note that, when TGZMODE is true,
 				# SRC_ARG is used only for printing
 				# human-readable messages.
 				SRC_ARG="${TGZLIST}"
 			elif [ -d "${OPTARG}" ]; then
 				# arg refers to a directory.
 				# It might be a source directory, or a
 				# directory where the sets have already
 				# been extracted.
 				DIRMODE=true
 				SRC_ARG="${OPTARG}"
 				if [ -f "${OPTARG}/etc/Makefile" ]; then
 					SOURCEMODE=true
 				fi
 			elif [ -f "${OPTARG%%:*}" -a -f "${OPTARG##*:}" \
 			       -a ! -f "${OPTARG}" ]
 			then
 				# Backward compatibility: allow arg to refer
 				# to a colon-separated list of tgz files.
 				# Remove this after NetBSD-5.0 is released.
 				cat >&2 <<EOF
 *** WARNING: The "-s tgzfile1:tgzfile2" option is deprecated.  Please use
              "-s tgzfile1 -s tgzfile2" in future.
 EOF
 				TGZMODE=true
 				TGZLIST="${TGZLIST}${TGZLIST:+ }$( \
 					IFS=: eval shell_quote \${OPTARG} )"
 @@ -1395,26 +1403,29 @@ EOF
 					tar -zxf -
 				) || err 2 "Can't extract ${tgz}"
 			done
+		)
 		SRC_DIR="${ETCTGZDIR}"
 	else
 		SRC_DIR="${SRC_ARG}"
 	fi
 	[ -d "${SRC_DIR}" ]	|| err 2 "${SRC_DIR} is not a directory"
 	[ -d "${DEST_DIR}" ]	|| err 2 "${DEST_DIR} is not a directory"
 	[ -n "${MACHINE}" ]	|| err 2 "\${MACHINE} is not defined"
 	[ -n "${MACHINE_ARCH}" ] || err 2 "\${MACHINE_ARCH} is not defined"
 	if ! $SOURCEMODE && ! [ -f "${SRC_DIR}/etc/mtree/set.etc" ]; then
 		err 2 "Files from the etc.tgz set are missing"
 	fi
 		# If directories are /, clear them, so various messages
 		# don't have leading "//".   However, this requires
 		# the use of ${foo:-/} to display the variables.
+		#
 	[ "${SRC_DIR}" = "/" ]	&& SRC_DIR=""
 	[ "${DEST_DIR}" = "/" ]	&& DEST_DIR=""
 	op="$1"
 	shift
 	case "${op}" in
 	diff)

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: postinstall.8,v 1.12 2008/09/14 14:24:15 apb Exp $
+.\"	$NetBSD: postinstall.8,v 1.13 2008/10/04 08:07:38 apb Exp $
 .\"
 .\" Copyright (c) 2005-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Thomas Klausner.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -17,27 +17,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 7, 2008
+.Dd October 4, 2008
 .Dt POSTINSTALL 8
 .Os
 .Sh NAME
 .Nm postinstall
 .Nd check and fix installation after system upgrades
 .Sh SYNOPSIS
 .Nm postinstall
 .Op Fl a Ar arch
 .Op Fl d Ar destdir
 .Op Fl m Ar machine
 .Op Fl s Brq Ar srcdir | Ar tgzdir | Ar tgzfile
 .Ar operation
 .Op Ar item Op ...
 @@ -76,49 +76,57 @@ Defaults to machine of the host operatin
 The location of the reference files, or the
 .Nx
 source files used to create the reference files.
 This may be specified in one of three ways:
 .Bl -tag -width XXsXtgzfileXX
 .It Fl s Ar srcdir
 The top level directory of the
 .Nx
 source tree.
 By default this is
 .Pa /usr/src .
 .It Fl s Ar tgzdir
 A directory in which reference files have been
-extracted from one or more of the
+extracted from a binary distribution of
 .Nx .
 The files that are distributed in the
 .Dq Pa etc.tgz
-or
+set file must be present.
 The files that are distributed in the
 .Dq Pa xetc.tgz
-files from a binary distribution of
+set file are optional.
 .Nx .
 .It Fl s Ar tgzfile
 The location of a set file
 (or
 .Dq "tgz file" )
 such as
-.Pa etc.tgz
+.Dq Pa etc.tgz
 or
-.Pa xetc.tgz
+.Dq Pa xetc.tgz
 from a binary distribution of
 .Nx .
 Each set file is a compressed archive containing reference files,
 which will be extracted to the
 .Pa temproot
 directory.
 Multiple
 .Fl s
 options may be used to specify multiple set files.
 The
 .Dq Pa etc.tgz
 set file must be specified.
 The
 .Dq Pa xetc.tgz
 set file is optional.
 .El
 .El
 .Pp
 The
 .Ar operation
 argument may be one of:
 .Bl -tag -width usageXX -offset indent
 .It Cm check
 Perform post-installation checks on items.
 .It Cm diff Op Xr diff 1 options
 Similar to
 .Cm check ,
 but also show the differences between the files.