Page MenuHomeFreeBSD
Files F154956482

D20279.id57455.diff
No OneTemporary
Actions

D20279.id57455.diff
View Options

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

File Metadata

Mime Type
text/plain
Expires
Fri, May 1, 7:43 AM (17 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32563088
Default Alt Text
D20279.id57455.diff (748 B)

Event Timeline