Page MenuHomeFreeBSD
Files F105728099

D20279.diff
No OneTemporary
Actions

D20279.diff
View Options

Index: head/usr.sbin/etcupdate/etcupdate.sh
===================================================================
--- head/usr.sbin/etcupdate/etcupdate.sh
+++ head/usr.sbin/etcupdate/etcupdate.sh
@@ -1737,7 +1737,9 @@
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"
+# 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
# about unsupported options. Since the configuration file is always
Index: head/usr.sbin/mergemaster/mergemaster.sh
===================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh
+++ head/usr.sbin/mergemaster/mergemaster.sh
@@ -669,9 +669,12 @@
;;
*)
# 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;} ||
+ { 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;} ||
{ echo '';
echo ' *** FATAL ERROR: Cannot copy files to the temproot environment';
echo '';

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 20, 6:59 PM (17 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15530721
Default Alt Text
D20279.diff (1 KB)

Event Timeline