From nobody Mon Dec 06 17:59:51 2021 X-Original-To: dev-commits-src-all@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 2062F18CC1A4; Mon, 6 Dec 2021 17:59:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4J7B614gMwz3rJc; Mon, 6 Dec 2021 17:59:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id C1B98E9E3; Mon, 6 Dec 2021 17:59:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <7d5db8fb-7cbd-d27a-7d59-59a50cbc4bb6@FreeBSD.org> Date: Mon, 6 Dec 2021 09:59:51 -0800 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: git: 0a2bc1aae36b - stable/12 - release: move installworld before installkernel Content-Language: en-US To: Jessica Clarke , Eugene Grosbein Cc: Ed Maste , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" References: <202112031520.1B3FK0Yh010104@gitrepo.freebsd.org> <0ceb1866-07a1-9ba8-8ea4-104329ca7cb8@grosbein.net> <409651DC-C965-4E47-A596-832C8EEB658C@freebsd.org> From: John Baldwin In-Reply-To: <409651DC-C965-4E47-A596-832C8EEB658C@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638813593; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WHT1GwlAFsvfC3CAjaAKREEMtxo6QQoPFAmEO6bOLxQ=; b=HlP1i2fRufQIj6bU8yNH6X0Ds5fWn2Vq+cBAJns7vVgAqxjLfPFnLokPWmKv3rVYAeIPpe bZrCQc1JoA0QFRc6spHWrgUxjZocSQvr/RaWdWi5MoZBV/YzBn9JXwvagE5rYFisIUqYuN VtdvRiSlK37IPGQARNgBMHHHTz5vswfkcdXfszTo0SEJhK7UQOqRnnZzcW7CvoiAaNIa7L EUGuR4Pka55Qc8/LyfhG1Fw+FnFqUusrnMDBcvqRAJHyK80YbJmvi/NG0fCHP4jZNxh/e4 OsgV0mTQDztCSaWUd3/KhSjvsUmIno2vxgDiQfqtkzWovSEnzjPRKVu7L4moDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638813593; a=rsa-sha256; cv=none; b=xprassgapUfu77vWTQj03V6sMqEZpfbkTCmT08oBENalBxifINJzKqmwNwXH9Z22tg0nWd doyzL9Pe0127f5jRQuLmSg7cKSmQOp5MVQqKRrpful+wPoTFGfgdKhEs9QUoD5lPhCHOe3 zKIarZtMsTfbRjKZrlVBDZ+zTqrh3RVordAuZMkf0BYuVdCJcT1Aw50HUgLJFhNjYQfcHs oUjuDC88O0xfObXGKZBTRPkc0BQ8j3cryB8Uh5I9lKDo3GzTSnNmaJk0vaYohu1ZPg4bOc 0GT8TeZmBd/5sZYNTpwJFoyou6cOC6XlfZVcU9Ha7zR3G1o+4w/RVFhHy63szA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 12/3/21 12:28 PM, Jessica Clarke wrote: > On 3 Dec 2021, at 20:20, Eugene Grosbein wrote: >> >> 03.12.2021 22:20, Ed Maste wrote: >> >>> The branch stable/12 has been updated by emaste: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=0a2bc1aae36b44b2c9e16684bc6270b8a82943e2 >>> >>> commit 0a2bc1aae36b44b2c9e16684bc6270b8a82943e2 >>> Author: Ed Maste >>> AuthorDate: 2021-04-05 17:16:01 +0000 >>> Commit: Ed Maste >>> CommitDate: 2021-12-03 15:19:09 +0000 >>> >>> release: move installworld before installkernel >>> >>> To support -DNO_ROOT work. The top-level installworld target creates a >>> new METALOG starting with `#mtree 2.0` so it needs to be first, to avoid >>> overwriting installkernel METALOG entries. >>> >>> Reviewed by: gjb >>> MFC after: 1 month >>> Sponsored by: The FreeBSD Foundation >>> Differential Revision: https://reviews.freebsd.org/D29582 >> >> The need to run installworld before installkernel makes remote major upgrade less reliable: >> in case of unexpected reboot in process a system ends up with new binaries that may require new system calls >> and old kernel. This is bad. >> >> Is it possible to enhance install* targets so they do not overwrite what needs to be kept intact >> to restore ability to install new kernel first? > > This is only for generating release images, hence the release: prefix > and the fact it’s in release/. It has no bearing on the sequence used > to update a running system. That said, the way METALOG is handled here is a bit annoying, and we've had to do some hacks in cheribuild to deal with this. It would be nice IMO if installworld wrote to METALOG.world, and installkernel wrote to METALOG.${INSTKERNNAME} (or something similar to permit METALOG.kernel and METALOG.kernel.GENERIC, etc.) and then steps that needed a full METALOG concatenated the relevant METALOG.* files to generate a merged file. -- John Baldwin