Page MenuHomeFreeBSD
Differential D20279 Diff 57462 usr.sbin/mergemaster/mergemaster.sh

Changeset View

Standalone View

View Options

usr.sbin/mergemaster/mergemaster.sh

Show First 20 Lines • Show All 663 Lines • ▼ Show 20 Lines '')
{ echo ''; { echo '';
echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
echo " the temproot environment"; echo " the temproot environment";
echo ''; echo '';
exit 1;} exit 1;}
;; ;;
*) *)
# 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 them 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;} ||
allanjudeUnsubmitted
Not Done
Inline Actions

We need to check if this new path exists, and fail back to the old path, so that this can be used in say 12.1 for both upgrading to 12.2 or 13.0.

We'll then also need to MFC it to all supported branches.

allanjude: We need to check if this new path exists, and fail back to the old path, so that this can be…
{ echo ''; { echo '';
echo ' *** FATAL ERROR: Cannot copy files to the temproot environment'; echo ' *** FATAL ERROR: Cannot copy files to the temproot environment';
echo ''; echo '';
exit 1;} exit 1;}
;; ;;
esac esac
# Doing the inventory and removing files that we don't want to compare only # Doing the inventory and removing files that we don't want to compare only
▲ Show 20 Lines • Show All 753 Lines • Show Last 20 Lines