From owner-freebsd-pkgbase@freebsd.org Wed Apr 27 05:45:42 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 876CCB1D96B for ; Wed, 27 Apr 2016 05:45:42 +0000 (UTC) (envelope-from woodsb02@gmail.com) Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com [IPv6:2a00:1450:400c:c09::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2112019E3 for ; Wed, 27 Apr 2016 05:45:42 +0000 (UTC) (envelope-from woodsb02@gmail.com) Received: by mail-wm0-x230.google.com with SMTP id e201so22689735wme.0 for ; Tue, 26 Apr 2016 22:45:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc; bh=/W9Kk6DiOzPUcbqYQqaer9o6OxYlvLcbzOBiH8BTJ7I=; b=oPR+I5nipXk4Kvcp4fxfI+C/jstqSJUaw5AkvqD0AP96aeQTWWsf918SmDQltwLdvj uHJZ0//uxXjTkCbaysv7s8G0LFdDoSRmX4p5u2FbTB2gkzpObcQbU3GGJD0JumpF1Ge1 0V+darkzbsEJpzCitEre1xJ613EyRqbeDGVLzVbVZqXFWN4fBk5tMjg8jEY49dKNpeln MM9blDfmgmT2cliSzK3ddEgX0ScE15MC55ernEiHHvpZgYdxHrIanXjEGCgc6kZ0AIh0 hTdtgjTokgLKagMbO4CBG3ewFx8cBg870YLbgdqFamMZpXmkKVPYXvLthmlyEIgzYZh2 ScTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=/W9Kk6DiOzPUcbqYQqaer9o6OxYlvLcbzOBiH8BTJ7I=; b=bl8/lyqLvYP/HtOSVFTdj1vS2Kk4F/0OGAxIDc5tE9KlXXN0lo/hHUc8xd8vzZO/HC E9vkFQkJjrrgPEzXgzSBEzEq3U9XmqY9zEG4xqxGDQaUtUHQKl/cLFAkGlyRKUpwlTvd BweFZjRWQinCOwFu+4svkJLU44yv3i954dIiP52i7P4RiJwiWfj+XmXbarwNSwrFQh3U BYVD6GySiDlEhFQMXiCl3XrP0r5SVJImH5Vy3vVxm3koDGc+lKe2hcBx7sdRNF6azIYH yWSBUqghEmKEGHkLhohmYbxKYRZf0qyQ6xfUZvVXlHMboZFUP+di/KGcLVnuXwnhs71x bYWw== X-Gm-Message-State: AOPr4FXIn4zJbx31YwwXn2c9J9UQ8U13NQgpLgAy1k57xfWXt1OWvM5a6LlwFe1MLwPhv8f7gG9W63YV9o+4ew== MIME-Version: 1.0 X-Received: by 10.194.157.195 with SMTP id wo3mr6927694wjb.155.1461735940327; Tue, 26 Apr 2016 22:45:40 -0700 (PDT) Received: by 10.194.42.41 with HTTP; Tue, 26 Apr 2016 22:45:40 -0700 (PDT) In-Reply-To: <22303.43243.357400.240656@khavrinen.csail.mit.edu> References: <22303.43243.357400.240656@khavrinen.csail.mit.edu> Date: Wed, 27 Apr 2016 07:45:40 +0200 Message-ID: Subject: Re: /etc/pkg/FreeBSD.conf being overwritten during pkg upgrade From: Ben Woods To: Garrett Wollman Cc: "freebsd-pkgbase@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 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 05:45:42 -0000 On Tuesday, 26 April 2016, Garrett Wollman wrote: > < > said: > > > One minor problem I have noticed is that each time I do a "pkg upgrade -r > > FreeBSD-base" it is overwriting /etc/pkg/FreeBSD.conf which I have edited > > to disable the default repository. My expectation is that configuration > > files should have a 3 way merge to maintain my local edits, rather than > > 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 > * face palm * Thanks Garrett. Reading the contents of /etc/pkg/FreeBSD.conf a bit closer, it does clearly state that! Thanks for pointing that out. Regards, Ben -- -- From: Benjamin Woods woodsb02@gmail.com