From owner-freebsd-current@freebsd.org Tue Apr 5 10:22:53 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 52AA5B03E13; Tue, 5 Apr 2016 10:22:53 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (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 DE1EC1C24; Tue, 5 Apr 2016 10:22:52 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: by mail-wm0-x242.google.com with SMTP id 20so2897575wmh.3; Tue, 05 Apr 2016 03:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=tDJPdbKyE8QZO02nnaWfkmSUzK7Tomrixg06Zmgbkx8=; b=K7J1b2WCQX97/aHy6DcbBgVLw9PEMJePjTe/JxOdxEzOD6cZqlnW8l7Uh2ON93rBym BwFdoofv5ZvRYeOX5BxedFDjOmDY7ht9t8F4HDRZQVIZHo12UxQmuDvZFraDB1djs9Q0 qRTaJfr53+IesC7XxQ2GBrliLCauErBWSEjcBEn4J7Y6H1mHJk9XU3sORUD3tNP2PtGs wCdq64wJisKuXylSIe5x0NZIJntVHmDUhLzJYXll2aQHqFTU5rVeAWUeDadur7vcOA+D raMps5NqsyWqZ6GntegNpqQfOpfaC9hSagUODCGtO/+Ph9pM/Uee0GkG26uLPhReuYfQ BFIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=tDJPdbKyE8QZO02nnaWfkmSUzK7Tomrixg06Zmgbkx8=; b=QpDZsxjSdhqjt2K33EgVnQzBKT08EW4zcA0mCIC4kMN9mTCrkImQSoC4c8eSFrrJZ6 VH81NMLZv7Aiz8Hpme3iAzrdY8ju/2MW1waHJ2vqBWg0KnsBMmAk0Cuv6H+jzYdYZFui m6bO/22x8IOypHa3K5ptNX3PfnZP3hvC1ql/v7Jh4YWD02//AB1PRGZzS0BQF89M2maw EHwMtFDox4rYNr6KEIMCGZywfpF9wSmoZpUEiCQGVLGl0dnIjU7FWJASE3bFtadzh+Ta /FyarB6Jsi0q/DH3aTU85wGlqBpDzWPN4h6WwMnA/c1/ao16eTv+S4VoIZ1pTXtZm+jd N1VA== X-Gm-Message-State: AD7BkJIwAJnR6UIpyYHWcYImm/MJNuSYTQ4GCpxW1ya4mbtKPIqKG+zBW6wZ7StyC+HCpw== X-Received: by 10.28.225.198 with SMTP id y189mr4373984wmg.34.1459851771380; Tue, 05 Apr 2016 03:22:51 -0700 (PDT) Received: from ernst.home (p578E1682.dip0.t-ipconnect.de. [87.142.22.130]) by smtp.gmail.com with ESMTPSA id lz5sm33915969wjb.5.2016.04.05.03.22.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2016 03:22:50 -0700 (PDT) Date: Tue, 5 Apr 2016 12:22:49 +0200 From: Gary Jennejohn To: David Chisnall Cc: Gergely Czuczy , Glen Barber , freebsd-pkgbase@FreeBSD.org, freebsd-current@FreeBSD.org Subject: Re: Packaging the FreeBSD base system with pkg(8) Message-ID: <20160405122249.19419b9f@ernst.home> In-Reply-To: <14CD9D09-A32E-46ED-96CA-296FC04B8506@FreeBSD.org> References: <20160127223323.GG98557@FreeBSD.org> <5703805A.7090204@harmless.hu> <14CD9D09-A32E-46ED-96CA-296FC04B8506@FreeBSD.org> Reply-To: gljennjohn@gmail.com X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.29; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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 10:22:53 -0000 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. -- Gary Jennejohn