From owner-freebsd-pkgbase@freebsd.org Wed Apr 27 06:11:23 2016 Return-Path: Delivered-To: freebsd-pkgbase@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2C89B1DCE2 for ; Wed, 27 Apr 2016 06:11:23 +0000 (UTC) (envelope-from lars@e-new.0x20.net) Received: from mail.0x20.net (mail.0x20.net [217.69.76.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.0x20.net", Issuer "mail.0x20.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 697BA1068 for ; Wed, 27 Apr 2016 06:11:22 +0000 (UTC) (envelope-from lars@e-new.0x20.net) Received: from e-new.0x20.net (mail.0x20.net [IPv6:2001:aa8:fffb:1::3]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.0x20.net (Postfix) with ESMTPS id C4C536E0081; Wed, 27 Apr 2016 08:11:19 +0200 (CEST) Received: from e-new.0x20.net (localhost [127.0.0.1]) by e-new.0x20.net (8.14.7/8.14.7) with ESMTP id u3R6BJR8069008; Wed, 27 Apr 2016 08:11:19 +0200 (CEST) (envelope-from lars@e-new.0x20.net) Received: (from lars@localhost) by e-new.0x20.net (8.14.7/8.14.7/Submit) id u3R6BIxB067831; Wed, 27 Apr 2016 08:11:18 +0200 (CEST) (envelope-from lars) Date: Wed, 27 Apr 2016 08:11:18 +0200 From: Lars Engels To: Ben Woods Cc: Garrett Wollman , "freebsd-pkgbase@freebsd.org" Subject: Re: /etc/pkg/FreeBSD.conf being overwritten during pkg upgrade Message-ID: <20160427061117.GZ82927@e-new.0x20.net> References: <22303.43243.357400.240656@khavrinen.csail.mit.edu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="8jSIhyJ+sG+KDNo4" Content-Disposition: inline In-Reply-To: X-Editor: VIM - Vi IMproved 7.4 X-Operation-System: FreeBSD 8.4-RELEASE-p23 User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: freebsd-pkgbase@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Packaging the FreeBSD base system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2016 06:11:23 -0000 --8jSIhyJ+sG+KDNo4 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 27, 2016 at 07:45:40AM +0200, Ben Woods wrote: > On Tuesday, 26 April 2016, Garrett Wollman wrote: >=20 > > < > > said: > > > > > One minor problem I have noticed is that each time I do a "pkg upgrad= e -r > > > FreeBSD-base" it is overwriting /etc/pkg/FreeBSD.conf which I have ed= ited > > > to disable the default repository. My expectation is that configurati= on > > > files should have a 3 way merge to maintain my local edits, rather th= an > > > overwriting them. > > > > Ben, I believe the official supported way to do this is to put your > > changes into /usr/local/etc/pkg/repos/FreeBSD.conf instead -- whatever > > is in there will override the files in /etc. > > > > -GAWollman > > >=20 > * face palm * >=20 > Thanks Garrett. Reading the contents of /etc/pkg/FreeBSD.conf a bit close= r, > it does clearly state that! >=20 > Thanks for pointing that out. Wouldn't /etc/pkg/FreeBSD.conf better be hosted in /etc/default then? --8jSIhyJ+sG+KDNo4 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJXIFgFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4RjQwMDE3RTRERjUzMTI1N0FGRTUxNDlF NTRDQjM3RDNBMDg5RDZEAAoJEOVMs306CJ1tzUgH/03aLz96Hl87bZEaeVFkuKsw XdKsXJJiAxFU3wzl6jIOZH/gblUe5+kZJZlFn5aS+Hap+BtOqYas9NeMPNIybZIi nKhK6r0vIzUj6MsTsTIUSB5KklpU6tHSIMeqS65alohh0vkn/f7oCNLcy0PkKH56 V6MrQ/zOCnHTLtmEhZRXhilG4XBY6C+txnPYljDRdKKc42cpijKuD7jmKF6PBqJX GLMgEmfpxnLUm+jSNyrW9xmjZrUaR1hJgk+ISLtdFs83X2efdsYJlOKI6PskddRP 2asaZjSl04mOjKNVKD3xcm99Z+vlmlqvWK2135+SEtLz+F6rv1ELR9RO9Bbyw5U= =iXtY -----END PGP SIGNATURE----- --8jSIhyJ+sG+KDNo4--