Date: Fri, 11 Aug 2017 13:54:19 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Ben Woods <woodsb02@gmail.com> Cc: Matthew Seaman <matthew@freebsd.org>, freebsd-pkgbase@freebsd.org Subject: Re: pkgbase update and progress Message-ID: <20170811135419.GD82820@FreeBSD.org> In-Reply-To: <CAOc73CDyKcXzSO-EfZLp9oHkXxq8jxZKGK5Ox69TynadhErzsg@mail.gmail.com> References: <20170810140615.GD63224@FreeBSD.org> <1218488026.1377609.1502378299872.JavaMail.zimbra@ixsystems.com> <20170810152151.GB82820@FreeBSD.org> <f2b904f8-af18-9d5b-9d8d-b99214d33f20@FreeBSD.org> <CAOc73CDyKcXzSO-EfZLp9oHkXxq8jxZKGK5Ox69TynadhErzsg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--ieNMXl1Fr3cevapt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Aug 10, 2017 at 11:05:06PM +0000, Ben Woods wrote: > On Thu, 10 Aug 2017 at 11:35 pm, Matthew Seaman <matthew@freebsd.org> wro= te: >=20 > > On 10/08/2017 16:21, Glen Barber wrote: > > >> * Since we have no mechanism of properly merging changes to /etc > > >> we simply copy files as needed with pc-updatemanager, and it is > > >> difficult to maintain what should be updated, merged, or removed. > > >> > > > This is another long-standing item in the list of things to fix, inde= ed. > > > > The idea floated at BSDCam was to have a package that would install a > > pristine copy of the /etc files under /var/db/etcupdate and prompt the > > user to then use that tool to update or install their configs. That > > should provide a nice compromise between having the files available from > > pkgs and not enforcing a specific mechanism (tools, not policy) to > > update /etc. > > > I haven't attended either of the conferences, and I'm sure this would have > been discussed, but for those of us who weren't there: >=20 > Pkgng has 3-way merge capability (copied from fossil-scm in pkg 1.4.0). W= hy > are we considering using it? Not having ever seen this functionality used, > I would have thought the only things to do would be agree on where the > pristine old copy would be stored (.sample files in /etc?) and perhaps > improve pkgng if the user experience isn't satisfactory. >=20 The problem isn't with pkg(8) ability to do a 3-way merge, but the way the relevant files are handled and installed by the installworld and distribute targets. Last I messed with etc/Makefile, for example, everyone using a packaged base that upgraded during a 12-hour timeframe (give or take) ended up with their /etc/master.passwd being overridden. This is the kind of fallout I do not want to experience again. I have been wanting to refactor etc/Makefile for some time, but I am not confident that rewriting it to meet packaged base needs is sufficient. I think we should instead use the tools that exist to do what they are written to do, regardless of an etc/Makefile rewrite. Hopefully this clarifies it a bit more. Glen --ieNMXl1Fr3cevapt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAlmNtwYACgkQAxRYpUeP 4pO5gA//U6UKGz80Q9n/SfPJBPyu60mx1nP6GYTRyrPi4+V9Ca8O1jMk6UC4jaE+ +0hiA4DFhnzFHWwKptlujv6fN1JacCX9LwlQY4CGl9lteALNURZXgRTlvdtAdxIK KL0+CJeOPyYfno1rxIi1tcuNvktzk1LtdstKq7q7lwhd4lyFxPH77CAL0hcIbdAI 7oIMfR1H4gES2PJ0M3Crh1UCcdsiVOEAGqx5ITW9a5GGbb0QKZV1XMJty+rnfwSQ w45E2yDosO5SmfwdlAn0s4lIBjaKhZceNJOREj0zZso+WBKWdRW1d0lEVQ2m1hbY 8zlDL4WBdRLXK+3P3nvc8UbFaxYNCjd2hSX/nfQJnx9J3oFYnJQ+ed+e9pzJpuwo cEoc6Lt3/E9OvtdSP7ncHrDfYPtmpLb0ascImTCfNd1mgDaU+jUXUgYDdipyKVBu P0wwak+07QcCAddczYNPTOpPHffTjGUn8gqzgamzgctvHo/LUXRIM0LrSV3eZsLQ szPHyZXvAV/aWvMA8Tmfu6BxzYqWoTepVhmtcULE6ywcirKUFDEDzxrc6VCIfCn3 Vvu6F5ZSjrpMiUW8an2pq944XKEWmULXcvbK46IGi6kegCglN4iP4JaiiokmpvSm S4R3k7ylbB5c1cT9MOodO/0JWQw3XAmY+S/9H8fie0Bar0H2OM4= =ldUY -----END PGP SIGNATURE----- --ieNMXl1Fr3cevapt--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170811135419.GD82820>