D20279.1778242789.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D20279.1778242789.diff
View Options

	Index: usr.sbin/etcupdate/etcupdate.sh
	===================================================================
	--- usr.sbin/etcupdate/etcupdate.sh
	+++ usr.sbin/etcupdate/etcupdate.sh
	@@ -1737,7 +1737,7 @@
	EDITOR=${EDITOR:-/usr/bin/vi}

	# Files that need to be updated before installworld.
	-PREWORLD_FILES="etc/master.passwd etc/group"
	+PREWORLD_FILES="lib/libc/gen/master.passwd lib/libc/gen/group"

	# Handle command-specific argument processing such as complaining
	# about unsupported options. Since the configuration file is always
	Index: usr.sbin/mergemaster/mergemaster.sh
	===================================================================
	--- usr.sbin/mergemaster/mergemaster.sh
	+++ usr.sbin/mergemaster/mergemaster.sh
	@@ -670,8 +670,8 @@
	*)
	# Only set up files that are crucial to {build\|install}world
	{ mkdir -p ${TEMPROOT}/etc &&
	- cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc &&
	- install -p -o root -g wheel -m 0644 ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} \|\|
	+ cp -p ${SOURCEDIR}/lib/libc/gen/master.passwd ${TEMPROOT}/etc &&
	+ install -p -o root -g wheel -m 0644 ${SOURCEDIR}/lib/libc/gen/group ${TEMPROOT}/etc;} \|\|
	{ echo '';
	echo ' *** FATAL ERROR: Cannot copy files to the temproot environment';
	echo '';