From owner-freebsd-current@freebsd.org Tue Apr 5 14:58:37 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 69684B04ACF; Tue, 5 Apr 2016 14:58:37 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (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 F25A81450; Tue, 5 Apr 2016 14:58:36 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by mail-wm0-x241.google.com with SMTP id n3so5077079wmn.1; Tue, 05 Apr 2016 07:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=YV9vS6LasxXkISKeiUdy+Mddy/ousK7i1zsIO/yXehU=; b=cfrw9MPID1uTPcZK7RzBJrX9nGoVuBWzD4fynJ2eRPLAVHnBj8m1+qXrgkJWSCg/kL 382r0oE2c7eQz/djBdJ2QWkHoEjz5rreoN2y4MnMC9ogmu4gNmA9NxQXTSmByaboaFBU 5JDXRxkeoHcLtCSxAzi9eF6eQbmEscRTrQFAFkRremPZcgNyM9DkZwz3de6H+vJU986m iPWHBOch1dO9690ev3ljsLLg4P3pGRny9vDFRrJSUh3MYo6hipDqP+T52hCQmhzr1AxX R2CZ1ACwoTYRKJFViDqx1fduwG7TMJrHV1pLoXRGPBeVJ6Z6yGpg8cDP9m0tGlNQZHEw YGPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=YV9vS6LasxXkISKeiUdy+Mddy/ousK7i1zsIO/yXehU=; b=ipdZ8/3OQ/3ZJTTSN9XhNSVT1lt40TwpN6m/izwjd0xHAmzv1KuU6dimYbmpvNZJpI 4GMo3CwdtR432Uc7BVfxfqtzA8/j4i2ma2mO3rNH6YwiCIQvwFlHNHj1SHE6gXotepdS DzDqsEuRBIEGYTZiwC3m2v9t7dDkzpYbSpgINuquChjFkYGgMBgF6Nvv/iJdg6SordPf HSL/o0lqnaB0MSEIuL3buqhwGsIGAYIa2NjiQLjdaa9PD+mcKzqBI6syEljXYJo1bFQ3 jtD2oLXdD/S069cWKXZ3lwjBURUwe9neY6atxlncC8cgR/ZwGe3AoHwO0EGJNVZlnEqb RMZw== X-Gm-Message-State: AD7BkJLFI2IhkkeGXPZFWdajx3N9Pt6YHoZqfmGUnp58lnS2o1PiOJMmWlkWPSCfYyYlvw== X-Received: by 10.194.20.193 with SMTP id p1mr13750303wje.87.1459868314524; Tue, 05 Apr 2016 07:58:34 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by smtp.gmail.com with ESMTPSA id wr2sm35171346wjc.49.2016.04.05.07.58.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2016 07:58:33 -0700 (PDT) Sender: Baptiste Daroussin Date: Tue, 5 Apr 2016 16:58:31 +0200 From: Baptiste Daroussin To: Gary Jennejohn Cc: David Chisnall , Glen Barber , freebsd-current@FreeBSD.org, Gergely Czuczy , freebsd-pkgbase@FreeBSD.org Subject: Re: Packaging the FreeBSD base system with pkg(8) Message-ID: <20160405145830.GH49864@ivaldir.etoilebsd.net> References: <20160127223323.GG98557@FreeBSD.org> <5703805A.7090204@harmless.hu> <14CD9D09-A32E-46ED-96CA-296FC04B8506@FreeBSD.org> <20160405122249.19419b9f@ernst.home> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="KscVNZbUup0vZz0f" Content-Disposition: inline In-Reply-To: <20160405122249.19419b9f@ernst.home> User-Agent: Mutt/1.5.24 (2015-08-30) 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 14:58:37 -0000 --KscVNZbUup0vZz0f Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 05, 2016 at 12:22:49PM +0200, Gary Jennejohn wrote: > On Tue, 5 Apr 2016 10:22:04 +0100 > David Chisnall wrote: >=20 > > On 5 Apr 2016, at 10:07, Gergely Czuczy wr= ote: > > >=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.=20 > >=20 > > 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. > >=20 >=20 > 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. Yes pkg has an option to not merge and will give you some .pkgnew files Bapt --KscVNZbUup0vZz0f Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXA9KWAAoJEGOJi9zxtz5apQsQAN5niLq6sFeDRv9849c2qpJr //ZrI7NkcI5bSkI4TOkE8R/sUMAcoC74kW0AD41qLHJEj6XY4ho6tF29LPANOjTQ YRzT9dJJlnOcOcNAAhPYBdoWHeKIN3rSib73yyyYbZiz3t/yt1ZdyPxgbTRTWX7X 1hi0A8uorri+YbfrjMI803K7clJLTl2OQWJ0Db1BRepRAhHsCldZxPapW71sFMFB RHFjNOi/qJI7ulupAc/ee4J4zcollYwXU9Z/CbjV2yJDcmuE9dDJH2+ByfuastuV Gw3C6UJ7bTY/DhBTnD32To5i2ajv/HLdOQw6Z6PGI8XyJQb4swJctaBnlPpekQ0B iIY6PKU0d8MGjYoUMr9gV0RLAx43rnYjNRX0IzNrcuoY/b2urAdfVdxm+eEzNAYZ UxSND5fhOpv3ZCW3CUohTo/XlgpBorDD4Td4qqBaDdbkJkjv5JLtK8rhs7tqGTvs 0JSL59nwDVnWRdKtFoiw2kH7pk1DpmN8Ps793MK/Z80oovyZIKuDPjvDHkjSWJMx 9B4P0flTzAnmh1QLiP1iD7bdJefalaZUYSTp2T8xiZEv1QswwGfO1lDkdiH04+xP 6/Hep30MctV05dr3qv4Q9w1I/HF/1vZIaFSMYdpX6f/f4oEcdMZnUljb/RVQgoQo xmqI5F509FDonFTypRpj =CyNJ -----END PGP SIGNATURE----- --KscVNZbUup0vZz0f--