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 '';