Date: Tue, 5 Apr 2016 12:22:49 +0200 From: Gary Jennejohn <gljennjohn@gmail.com> To: David Chisnall <theraven@FreeBSD.org> Cc: Gergely Czuczy <gergely.czuczy@harmless.hu>, Glen Barber <gjb@FreeBSD.org>, freebsd-pkgbase@FreeBSD.org, freebsd-current@FreeBSD.org Subject: Re: Packaging the FreeBSD base system with pkg(8) Message-ID: <20160405122249.19419b9f@ernst.home> In-Reply-To: <14CD9D09-A32E-46ED-96CA-296FC04B8506@FreeBSD.org> References: <20160127223323.GG98557@FreeBSD.org> <5703805A.7090204@harmless.hu> <14CD9D09-A32E-46ED-96CA-296FC04B8506@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 5 Apr 2016 10:22:04 +0100 David Chisnall <theraven@FreeBSD.org> wrote: > On 5 Apr 2016, at 10:07, Gergely Czuczy <gergely.czuczy@harmless.hu> wrote: > > > > Also, quite often entries from the base system are changed > > manually, think of root's/toor's password. Are such cases > > going to be dealt with properly between upgrades, including > > self-built-and-packaged base systems? Currently it can be a > > PITA with mergemaster to handle things like master.passwd > > properly between upgrades, automation so far wasn't famous on > > doing it properly. > > Mergemaster uses a 2-way merge. It has the version that you > have installed and the version that's being proposed for > installation. Etcupdate and pkg perform a 3-way merge. It has > the pristine version, the version that you have made changes > to, and the new version. If you have changed an entry and so > has the package, then you will get a conflict that you have to > resolve manually. If you have added lines and so has the > upstream version, then that should cleanly apply. Similarly, > if you and upstream have both modified different lines, then > there should be no problem. > Will there be an option not to merge? I never update /etc when I do installworld because what I have works for me and I see no need to make any changes to a working system. -- Gary Jennejohn
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160405122249.19419b9f>