From nobody Wed Mar 06 17:24:18 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqfS52kSZz5CyYF for ; Wed, 6 Mar 2024 17:24:21 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqfS51vsrz4nhF; Wed, 6 Mar 2024 17:24:21 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709745861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=BijnUN4vyCZB67LlVFLpETUB+R7ZI4UOk3z6i8FMpiI=; b=DtZKRmqtCwtXLGeniM7pgAv/+37xM3/1XPn4IqEz8XP34F115tJLija4ef1zGk7ejaDhi4 fehNqz0maZQJylJRhjanRAEcA9bLsoRdasyBjYdqHBIb1h0gYqqG5c9wfvHD8UvnygoSWJ jZWC61+Q8ALZM3I5cLw2suI/dflu9D8iBr8H2KK+bkUJEdBLn2FaU7uIiHcecAGq4+DSb4 2TSwHDCyOlAkpk8tpazC/09dPsRLMuShZX6qPNh/kdgYNV0kV/cOUNT6/a3UxIuh8abtRK 2mEsijuT7au5Oh0IpTFVy0SlzCRXpc1dIyT2U28aRqhK7orI6m0Y+xzf5bR/dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709745861; a=rsa-sha256; cv=none; b=Pf9nGWDE8tW+/wyCzGSK1vEU9XG4b5bp9DyExsiutGDoQFWiTifa0RXToAXfjXqnEl4Rm4 NZ3e5Zr08Ck4g0AXBtpRTpbnSj9L429Llu4pZB3++E6suX4Wc1WmcXh/lyqTWqjzAj5zXa g4+sZO1qC/Mn98sm0xwx77TBMWvjdKP3Ai+h1I3FeHVRUCZdNhT3I5jZMHa7IlFJ71xmCY MBq9wTzvr0CCoYM4lv5h7OQdD7/60ohkw86B4+8WZP3IiOYw6EbJRCceozGz5gUrE/zWA8 kkQGUxTW3CUBklQCb32zucqU5Ru9OwVMcdNlRq+ENzbhn6ClZiZp18bZJfbqNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709745861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=BijnUN4vyCZB67LlVFLpETUB+R7ZI4UOk3z6i8FMpiI=; b=Gr6nP/6L71BO8vlOQOBXXv+kUnZjOxtujoZ6EG6M8jgenLTXanl6IBAqD++mAT5Gc41AqR 2/trhIPQHy/X3Y9dazM3zc7qJY2YdsgUIHAQ2rkCAW4TNOoRLA6/dOZA0t7Z5VuCD+f8e2 z0XplVjp71O8oOsJnISBT4JdrrrITuL+1KgpmJ8oO/upuQapqH9rwFMhMrpC88xGkWWnbK gMNvdtYQuJDgIxPeeK3ccfGpl2taRT2LNZ0AxiAW5863P6kwTmL9RNT/7mwq+ypqnF0EV4 D3HYqTTRvDhohTrgif+vHk3Pk9+T2vZuGyx3nsM+tjOz02RNtvUVPW9CEbS1XQ== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TqfS50psgzPv9; Wed, 6 Mar 2024 17:24:21 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id ADF2E1B0023; Wed, 6 Mar 2024 18:24:18 +0100 (CET) Date: Wed, 6 Mar 2024 18:24:18 +0100 From: Baptiste Daroussin To: Roger Marquis Cc: Graham Perrin , freebsd-pkgbase@freebsd.org Subject: Re: pkgbase and config file merges Message-ID: References: <8137de78-e205-4e7c-a25b-700045b3c950@gmail.com> <2i4vs2rmlpqssl5wyrzhn5izyvuoxz2rmfjbjlaaq6exuqbllm@e436o6dw7nx3> <5ns1p95s-n316-22qs-63p2-q6246q043802@mx.roble.com> List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5ns1p95s-n316-22qs-63p2-q6246q043802@mx.roble.com> On Wed, Mar 06, 2024 at 08:59:36AM -0800, Roger Marquis wrote: > Automatically overwriting files like passwd is clearly a problem. > Preferred solution would be a list, say [never_overwrite] and/or [ask > before overwriting] and/or [write diff to /var/db/pkgbase/...] in > /etc/defaults/pkgbase specifying existing files that should never be > modified without at least a dialog. > > This plus the cleanup of pkgsave files which should only be written to > /var/db/pkgbase/pkgsave/`date +%G%m%d%H%M` should address the blockers > to more widespread adoption of packagebase and, ideally, make it > mandatory or at least the default option in the next version of FreeBSD. > this can only happen in the bootstrap phase and not otherwise, in normal usage there is always a 3 way merge happening and if the 3 way merge fails there the original is preserved and a file.pkgnew is created with the new content. pkg should always be and remain unattended, once it enter a transaction so there is no plan to make it interactive. I don't understand what you are asking for about the .pkgsave files cleanup. Best regatrds, Bapt