diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2019-05-23 18:37:05 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2019-05-23 18:37:05 +0000 |
| commit | 45a13fd89987533add2888ed3cc093fab29e3bbc (patch) | |
| tree | fdb21cb828302b8cd8d3f16167f5548ef70e71c2 /usr.sbin/mergemaster | |
| parent | c438379f054dc6567231717bc4134cf7d5e28b35 (diff) | |
| download | src-test2-45a13fd89987533add2888ed3cc093fab29e3bbc.tar.gz src-test2-45a13fd89987533add2888ed3cc093fab29e3bbc.zip | |
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 9a92a13a947e..b6106f60bff2 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -669,12 +669,9 @@ case "${RERUN}" in ;; *) # Only set up files that are crucial to {build|install}world - { MM_PASSDIR="${SOURCEDIR}/lib/libc/gen" - # If on an older tree, use it instead. Delete after 13.0. - [ -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;} || + { 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;} || { echo ''; echo ' *** FATAL ERROR: Cannot copy files to the temproot environment'; echo ''; |