On 1/25/19 1:50 AM, Edward Napierala wrote: >> mergemaster, iirc, will merge in changes to etc files after an upgrade. >> So this would effect anybody that goes through an upgrade and performs >> mergemaster. > > No, it won't - it doesn't affect files in /etc at all. It doesn't > affect stuff that's being installed by mergemaster(8), nor stuff > installed by 'make install'. It only affects the default /root/.profile > and /root/.shrc, as installed by bsdinstall(8) or shipped as VM or SD > card images.
Nope. Try again: % ll /var/db/etcupdate/current/root/ total 18 -rw-r--r-- 2 root wheel 949 Nov 17 17:41 .cshrc -rw-r--r-- 1 root wheel 147 Nov 17 17:41 .k5login -rw-r--r-- 1 root wheel 390 Nov 17 17:41 .login -rw-r--r-- 2 root wheel 468 Nov 17 17:41 .profile Both etcupdate and mergemaster use 'make distribution' to build the set of files (mostly things in /etc) that get merged. If it doesn't get installed by installworld but does get installed in 'base.txz', then etcupdate and mergemaster will try to merge it. -- John Baldwin _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"