From nobody Sun Sep 10 11:41:05 2023 X-Original-To: freebsd-current@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 4Rk7GF3GPjz4sDL0 for ; Sun, 10 Sep 2023 11:41:09 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rk7GF1BsWz4H62; Sun, 10 Sep 2023 11:41:09 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-99c136ee106so430319066b.1; Sun, 10 Sep 2023 04:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694346067; x=1694950867; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=I5GndDcKtLDbLLNgjJPNe+G49Gm7gtImK06PIPseP9w=; b=X5xD7AbWWxHbgbpzjFH40LG9P5HjJgQm6xrYnvvLSaRQ6bHA5+D/6aKLGP5zN1GFpk ZaLrrWZTOFgCuz/UFwAr0d+iVEkc4EnQaGRxi3OcF3wL2rzMF1m7Gw6D/Yi4yL9Xhgeh JIqIvd4BC+FOi3lD6vtct5fBZEoZTsu9MgSM1dkET+iRtEGVM8VkQun7sftFjoB0EjxJ a4hNJbxSPSIBS3Z/5x4zoQg2CKUbZWK4lVf538avvHqKoCUcVKLLPUNonNjekqnijiUq W0ADRc/3+5PE+vNf09PsVYsQCB2nB0WlCnvhsTfpKRub52ivzNYgW2V4MjyWhSOYY5YZ /nYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694346067; x=1694950867; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=I5GndDcKtLDbLLNgjJPNe+G49Gm7gtImK06PIPseP9w=; b=uxvmyvYW1B4oLxjo9jZJi13LEdjbtMSUeJgvsLfF9o1hO5eumGgIlfMBoJodkMC5PK nbN7SxsLvt1INfPev/9L/PnKlXMilXJ65gjqAuBmoSy1SbZFb/AJTLcrUSGP+Q0rwMio F7UPebVLSEYAeFWVXAC1Q6ghuvc8JOg7rrjGN60K0LniggQt2RryOQBcIaKKFkWTQAX6 MgODFCBOwee+f5w4YzHWKfR5tdEixvlGI7XXy8HpljYzNy5py5ivuZQ434odmT473S/N PNlHF+yBuMi7qd5Du4j82re8artvTkchjdm+uPeBhxct4IdXA9O6A53ZIMyOjDtnkNXn IsaQ== X-Gm-Message-State: AOJu0YxC3rJJ3pNDhLwVkMxRK0bz6joO7iCEuLze0Rx58JM/wzzw/K9E TpwuX0Kd91ZvgxzNe8F1qdgwWqaBHHKeNQ== X-Google-Smtp-Source: AGHT+IE/yqJQXJcy5EBavXqQN8pJEz/2eMkGgPEvG4shqVtHA9ySVuCdpSA3jHYJdeAh2y+Em8rvWA== X-Received: by 2002:a17:907:78d1:b0:9a1:edfd:73bb with SMTP id kv17-20020a17090778d100b009a1edfd73bbmr6102893ejc.47.1694346066804; Sun, 10 Sep 2023 04:41:06 -0700 (PDT) Received: from [192.168.1.10] (80-42-66-93.dynamic.dsl.as9105.com. [80.42.66.93]) by smtp.gmail.com with ESMTPSA id lj16-20020a170906f9d000b00992d0de8762sm3686552ejb.216.2023.09.10.04.41.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 10 Sep 2023 04:41:06 -0700 (PDT) Message-ID: <1067e373-01fb-4c10-5b97-1c784b3ed895@gmail.com> Date: Sun, 10 Sep 2023 12:41:05 +0100 List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: /var/db/etcupdate/ in hier(7) (was: user problems when upgrading to v15) To: John Baldwin Cc: "freebsd-current@freebsd.org" , Dimitry Andric References: <5c5c3ea5-5b14-d969-f55f-b894e4983359@sonicboom.org> <46ee9e3b-adeb-4cd1-5fcc-43547c5c7231@gmail.com> <222e96ba-70b6-e976-8e32-d3726dde18b1@sonicboom.org> <7CDB341A-F9E1-4816-8443-E4C349A86C84@FreeBSD.org> <865dc0ef-a19d-876c-b0a5-03b888b531f5@FreeBSD.org> Content-Language: en-US From: Graham Perrin In-Reply-To: <865dc0ef-a19d-876c-b0a5-03b888b531f5@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Rk7GF1BsWz4H62 On 09/09/2023 17:02, John Baldwin wrote: > On 9/2/23 7:11 AM, Dimitry Andric wrote: >> … > > … /var/db/etcupdate/conflicts, … Shall I make a simple (non-contentious) pull request for hier(7) to include /var/db/etcupdate/ and the conflicts/ subdirectory? /var/db/etcupdate/ is present by default with a clean installation of 15.0-CURRENT. I guess that conflicts/ appears (and remains after resolution) only after the first conflict is found. True?