Date: Mon, 28 Jan 2019 10:07:12 -0800 From: John Baldwin <jhb@FreeBSD.org> To: Devin Teske <dteske@freebsd.org>, rgrimes@freebsd.org, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r343440 - head/bin/sh Message-ID: <ae941983-4c1f-3404-a397-76d1653a794a@FreeBSD.org> In-Reply-To: <20190125095051.GA26744@v2> References: <201901251709.x0PH9Rc4094379@repo.freebsd.org> <201901251957.x0PJvdTL089917@pdx.rh.CN85.dnsmgr.net> <CAFLM3-oSafSxcWSJPEXQ8szLEq5N593fr=sEsup6A2%2BP_VXrgQ@mail.gmail.com> <D7EEA6BA-EAA6-4A84-A7C4-904999B0E581@FreeBSD.org> <20190125082851.GA26199@v2> <1F038D39-8869-4220-A274-F6307A4264E2@FreeBSD.org> <20190125091334.GA26545@v2> <6DD219EC-C898-499E-BF58-AB653A7114DB@FreeBSD.org> <20190125095051.GA26744@v2>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ae941983-4c1f-3404-a397-76d1653a794a>