From nobody Thu Oct 19 20:43:06 2023 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 4SBKRZ48Tvz4xrmf; Thu, 19 Oct 2023 20:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBKRZ3d0Yz4Hf9; Thu, 19 Oct 2023 20:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697748186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hlpmzCo2EplzHATMqhVqTohJTPg7kabeiXltyWkutg=; b=BDxaDwVa68hSXVjLL9zaT8OPs+SltakSmOMEkSJphSGrb8FjO97aIidP51Uu6D5ipcP9gT gcSElDqGWNKct2eGnw4Q5tsjwrjHto+t9n+vCZESSriT50fYBkEu7MvELDAyr/7YoMR8fO 5AHmg4Oq+tBrUgEjWXu7xI7+EX+5FH96sNo4ZBxFYHj2u0Szf51NJSfVucMAC7f0DogGhp 6lefN/wtU1M7xolRZX84x5WQsF/gIVDPbURY3q5IPgDWUD5qEuz8xyRGmgv7t1B5yT84zX fQlQq2cgsdVTSG15CPAh4EWds6x9efKDSoleE91iXpiqBkxKUvsSRVIMZMCDxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697748186; a=rsa-sha256; cv=none; b=vB18YPA/oz5W9Kw+KK+J6SSU39Y1/MX9nq181rB+ELgwpVZDoUOUkaLT8jnxuH0ce8FT7l W1V3tfKBhWK85v69VO4ndyIJyqMFrvY40DC7rF5GsmppFlL8nGp4A+mYkDzKpcaalFOGFl FOiWWlY7GPjd/5fQ5OKCXOKliNE3ictLVYJF3i2wRACX8w9Oc0E+SO9p/Qn6UDlk9G31+0 uYq96VIdSsUBVm+mcNQ+LAuzV4rnf9qc4s2T0jcOtIKe6ZE/AixNBWSeldObcEPCdfDE9I 05pYGpu2Pb3u4sv25+0VREFLLg+oGTfZrER0gX9RVSyQr6EJbK9JMFKNcXhT6w== 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=1697748186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hlpmzCo2EplzHATMqhVqTohJTPg7kabeiXltyWkutg=; b=vpXO0yTxo7C5TmfEVpAUpCg5sQsFWNXxU8Go4FetjkAuBLgNbPD6OWMpJbm52769nOfCV5 +ZDZ/+S+1eil+DQP9qN3U3vf4xVh+3AIKkfeIX6zY9SltsQeP9rK3h8o1tmVqDLuZ6VA2W i6bYSUHT/3QoZzJzO8CVtTaQ8jRb3ZFBvmvEn5k+OBTGhHbgDlw+4y7pPF9iS2Bn9T92qm 6pzrTeFNEV50D1ZaRxNSNOZBMPrQeNVZZEumJ44EqiY6erR5/RFD91Hz2vHznyUjsm6ZDz QVJgE/0v0aDcOJ2VwLzGahYHlGSuEDtOyI/F/57iBm1rnPwh7jjCcyEVbcwEFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBKRZ2kMXz14bJ; Thu, 19 Oct 2023 20:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JKh6PD009389; Thu, 19 Oct 2023 20:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JKh6mq009386; Thu, 19 Oct 2023 20:43:06 GMT (envelope-from git) Date: Thu, 19 Oct 2023 20:43:06 GMT Message-Id: <202310192043.39JKh6mq009386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 929e4723c3f5 - releng/14.0 - bsdinstall partedit: Apply changes from scripted installs 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 929e4723c3f5e66dd98fe3f342c6ec393c8eb9a5 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=929e4723c3f5e66dd98fe3f342c6ec393c8eb9a5 commit 929e4723c3f5e66dd98fe3f342c6ec393c8eb9a5 Author: John Baldwin AuthorDate: 2023-10-16 22:13:31 +0000 Commit: John Baldwin CommitDate: 2023-10-19 20:42:35 +0000 bsdinstall partedit: Apply changes from scripted installs I got a check inverted in a previous cleanup commit and as a result partedit was only applying GEOM changes (and generating an /etc/fstab) if it got an error reading the current GEOM mesh. Instead, it needed to do those actions if it succeeded in reading the mesh. The lack of /etc/fstab meant that bsdinstall mount didn't mount anything in a scripted install. PR: 273723 Reported by: Andrey Fesenko Reported by: Michal Nowak Reviewed by: cognet, brooks Fixes: 230990991965 bsdinstall: Handle errors from geom_gettree. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42236 (cherry picked from commit 5307bbcc038f878b4b3714f03a2c824a0caeba4f) (cherry picked from commit bfbb28f3b1b659805364eea580033b4b3afcc0eb) Approved by: re (gjb) --- usr.sbin/bsdinstall/partedit/partedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index 6579c22f6068..3c5f552a935c 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -215,7 +215,7 @@ main(int argc, const char **argv) if (prompt == NULL) { error = geom_gettree(&mesh); - if (error != 0) { + if (error == 0) { if (validate_setup()) { error = apply_changes(&mesh); } else {