From owner-freebsd-current@freebsd.org Wed Apr 6 17:56:41 2016 Return-Path: Delivered-To: freebsd-current@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 78472B06738; Wed, 6 Apr 2016 17:56:41 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5804914E7; Wed, 6 Apr 2016 17:56:41 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id C65FBB97D; Wed, 6 Apr 2016 13:56:39 -0400 (EDT) From: John Baldwin To: freebsd-current@freebsd.org, gljennjohn@gmail.com Cc: David Chisnall , Gergely Czuczy , Glen Barber , freebsd-pkgbase@freebsd.org, freebsd-current@freebsd.org Subject: Re: Packaging the FreeBSD base system with pkg(8) Date: Wed, 06 Apr 2016 10:56:08 -0700 Message-ID: <1602050.ZkkBBj7Otx@ralph.baldwin.cx> User-Agent: KMail/4.14.3 (FreeBSD/10.2-STABLE; KDE/4.14.3; amd64; ; ) In-Reply-To: <20160405122249.19419b9f@ernst.home> References: <20160127223323.GG98557@FreeBSD.org> <14CD9D09-A32E-46ED-96CA-296FC04B8506@FreeBSD.org> <20160405122249.19419b9f@ernst.home> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Wed, 06 Apr 2016 13:56:39 -0400 (EDT) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Apr 2016 17:56:41 -0000 On Tuesday, April 05, 2016 12:22:49 PM Gary Jennejohn wrote: > On Tue, 5 Apr 2016 10:22:04 +0100 > David Chisnall wrote: > > > On 5 Apr 2016, at 10:07, Gergely Czuczy 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. Some parts of /etc (like /etc/rc.d) aren't really config files and need to be updated. You wouldn't have working wireless after a 10 -> 11 upgrade if you didn't update /etc/rc.d (and some helper scripts those use like /etc/rc.subr and /etc/network.subr). The files in /etc that are config files rarely change in FreeBSD in my experience compared with the "non-config" files like /etc/rc.d/*. I rarely encounter conflicts when using etcupdate personally, but both etcupdate and mergemaster can be configured to ignore individual files (or globs of files). -- John Baldwin