Date: Tue, 5 Apr 2016 16:58:31 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Gary Jennejohn <gljennjohn@gmail.com> Cc: David Chisnall <theraven@FreeBSD.org>, Glen Barber <gjb@FreeBSD.org>, freebsd-current@FreeBSD.org, Gergely Czuczy <gergely.czuczy@harmless.hu>, freebsd-pkgbase@FreeBSD.org Subject: Re: Packaging the FreeBSD base system with pkg(8) Message-ID: <20160405145830.GH49864@ivaldir.etoilebsd.net> In-Reply-To: <20160405122249.19419b9f@ernst.home> References: <20160127223323.GG98557@FreeBSD.org> <5703805A.7090204@harmless.hu> <14CD9D09-A32E-46ED-96CA-296FC04B8506@FreeBSD.org> <20160405122249.19419b9f@ernst.home>
next in thread | previous in thread | raw e-mail | index | archive | help
--KscVNZbUup0vZz0f Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 05, 2016 at 12:22:49PM +0200, Gary Jennejohn wrote: > On Tue, 5 Apr 2016 10:22:04 +0100 > David Chisnall <theraven@FreeBSD.org> wrote: >=20 > > On 5 Apr 2016, at 10:07, Gergely Czuczy <gergely.czuczy@harmless.hu> wr= ote: > > >=20 > > > 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.=20 > >=20 > > 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. > >=20 >=20 > 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. Yes pkg has an option to not merge and will give you some .pkgnew files Bapt --KscVNZbUup0vZz0f Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXA9KWAAoJEGOJi9zxtz5apQsQAN5niLq6sFeDRv9849c2qpJr //ZrI7NkcI5bSkI4TOkE8R/sUMAcoC74kW0AD41qLHJEj6XY4ho6tF29LPANOjTQ YRzT9dJJlnOcOcNAAhPYBdoWHeKIN3rSib73yyyYbZiz3t/yt1ZdyPxgbTRTWX7X 1hi0A8uorri+YbfrjMI803K7clJLTl2OQWJ0Db1BRepRAhHsCldZxPapW71sFMFB RHFjNOi/qJI7ulupAc/ee4J4zcollYwXU9Z/CbjV2yJDcmuE9dDJH2+ByfuastuV Gw3C6UJ7bTY/DhBTnD32To5i2ajv/HLdOQw6Z6PGI8XyJQb4swJctaBnlPpekQ0B iIY6PKU0d8MGjYoUMr9gV0RLAx43rnYjNRX0IzNrcuoY/b2urAdfVdxm+eEzNAYZ UxSND5fhOpv3ZCW3CUohTo/XlgpBorDD4Td4qqBaDdbkJkjv5JLtK8rhs7tqGTvs 0JSL59nwDVnWRdKtFoiw2kH7pk1DpmN8Ps793MK/Z80oovyZIKuDPjvDHkjSWJMx 9B4P0flTzAnmh1QLiP1iD7bdJefalaZUYSTp2T8xiZEv1QswwGfO1lDkdiH04+xP 6/Hep30MctV05dr3qv4Q9w1I/HF/1vZIaFSMYdpX6f/f4oEcdMZnUljb/RVQgoQo xmqI5F509FDonFTypRpj =CyNJ -----END PGP SIGNATURE----- --KscVNZbUup0vZz0f--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160405145830.GH49864>