From owner-freebsd-current@freebsd.org Tue Apr 5 09:22:23 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 A1255B026BD; Tue, 5 Apr 2016 09:22:23 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cloud.theravensnest.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 77DF31E52; Tue, 5 Apr 2016 09:22:22 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from [192.168.0.7] (cpc91230-cmbg18-2-0-cust661.5-4.cable.virginm.net [82.1.230.150]) (authenticated bits=0) by theravensnest.org (8.15.2/8.15.2) with ESMTPSA id u359MB2d006756 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 5 Apr 2016 09:22:14 GMT (envelope-from theraven@FreeBSD.org) X-Authentication-Warning: theravensnest.org: Host cpc91230-cmbg18-2-0-cust661.5-4.cable.virginm.net [82.1.230.150] claimed to be [192.168.0.7] Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: Packaging the FreeBSD base system with pkg(8) From: David Chisnall In-Reply-To: <5703805A.7090204@harmless.hu> Date: Tue, 5 Apr 2016 10:22:04 +0100 Cc: Glen Barber , freebsd-pkgbase@FreeBSD.org, freebsd-current@FreeBSD.org Content-Transfer-Encoding: quoted-printable Message-Id: <14CD9D09-A32E-46ED-96CA-296FC04B8506@FreeBSD.org> References: <20160127223323.GG98557@FreeBSD.org> <5703805A.7090204@harmless.hu> To: Gergely Czuczy X-Mailer: Apple Mail (2.2104) 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: Tue, 05 Apr 2016 09:22:23 -0000 On 5 Apr 2016, at 10:07, Gergely Czuczy = wrote: >=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. Mergemaster uses a 2-way merge. It has the version that you have = installed and the version that=E2=80=99s 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. David