d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mergemaster after r347638 and the master.passwd / group move.

Browse Source 
Check the legacy directory and use it instead if present.

Install these first if using beinstall.

UPDATING entry to follow.

Approved by:	allanjude (mentor, in person)
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D20279
This commit is contained in:
brd 2019-05-16 21:50:12 +00:00
parent 50552705f2
commit 76354a5d4e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/etcupdate/etcupdate.sh
View File

@ -1737,7 +1737,9 @@ WARNINGS=$WORKDIR/warnings
EDITOR=${EDITOR:-/usr/bin/vi} EDITOR=${EDITOR:-/usr/bin/vi}
# Files that need to be updated before installworld. # 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"
# If on an older tree, use it instead. Delete after 13.0.
[ -f ${SRCDIR}/etc/master.passwd ] && PREWORLD_FILES="etc/master.passwd etc/group"
# Handle command-specific argument processing such as complaining # Handle command-specific argument processing such as complaining
# about unsupported options. Since the configuration file is always # about unsupported options. Since the configuration file is always

9
usr.sbin/mergemaster/mergemaster.sh
View File

@ -669,9 +669,12 @@ case "${RERUN}" in
;; ;;
*) *)
# Only set up files that are crucial to {build|install}world # Only set up files that are crucial to {build|install}world
{ mkdir -p ${TEMPROOT}/etc && { MM_PASSDIR="${SOURCEDIR}/lib/libc/gen"
cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc && # If on an older tree, use it instead. Delete after 13.0.
install -p -o root -g wheel -m 0644 ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} || [ -f ${SOURCEDIR}/etc/master.passwd ] && MM_PASSDIR="${SOURCEDIR}/etc"
mkdir -p ${TEMPROOT}/etc &&
cp -p ${MM_PASSDIR}/master.passwd ${TEMPROOT}/etc &&
install -p -o root -g wheel -m 0644 ${MM_PASSDIR}/group ${TEMPROOT}/etc;} ||
{ echo ''; { echo '';
echo ' *** FATAL ERROR: Cannot copy files to the temproot environment'; echo ' *** FATAL ERROR: Cannot copy files to the temproot environment';
echo ''; echo '';