D57504.id180318.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D57504.id180318.diff
View Options

	diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
	--- a/usr.sbin/etcupdate/etcupdate.sh
	+++ b/usr.sbin/etcupdate/etcupdate.sh
	@@ -200,6 +200,7 @@

	log "Building tree at $1 with $make"

	+ exec 4>&2
	exec >&3 2>&1

	mkdir -p $1/usr/obj
	@@ -216,7 +217,16 @@
	else
	(
	cd $SRCDIR \|\| exit 1
	- if ! [ -n "$nobuild" ]; then
	+ if [ -n "$nobuild" ]; then
	+ # Check for prior build
	+ objdir=$($make -V .OBJDIR)
	+ if ! [ -f "${objdir}/${BUILD_SENTINEL}" ]; then
	+ cat <<EOF >&4
	+Build sentinel not found in object directory, did you forget to make
	+buildworld or pass -b to etcupdate?
	+EOF
	+ fi
	+ else
	export MAKEOBJDIRPREFIX=$destdir/usr/obj
	if [ -n "$($make -V.ALLTARGETS:Mbuildetc)" ]; then
	$make buildetc \|\| exit 1
	@@ -1900,6 +1910,9 @@
	# Files that need to be updated before installworld.
	PREWORLD_FILES="etc/master.passwd etc/group"

	+# A file we know the build produces in the object directory.
	+BUILD_SENTINEL=etc/termcap/termcap.small
	+
	# Handle command-specific argument processing such as complaining
	# about unsupported options. Since the configuration file is always
	# included, do not complain about extra command line arguments that