From nobody Mon Oct 16 22:14:33 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 4S8WcT678Hz4xsBF; Mon, 16 Oct 2023 22:14:33 +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 4S8WcT5bVMz4V0M; Mon, 16 Oct 2023 22:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697494473; 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=xFQy/JRtLwkQ5/oYe6Iq2BlYCMPfRwAU6JOLLX8PVuc=; b=v0Cdpbi6CMNt1yaAfQysuCt1wNuqagqBtXLcgYwEu8Q8eue9Ajv8O5IvwwkfB9h5CIGPR/ u/wlcOahfbi4weSXsGvwmFAPApYO0uuig11yyvwnn3QUS2qgjYH08TpobS/p92kp15JNmQ Pz1VD2M19v5YfJYL2A9tzuxpktxyZg5ic9h0W+DVjfLckA4TF1SQmpPIrtCbIEd+mLNx7j yuVEFQSkmkbd0aHB9eVZ8pLF5JajtFN03pb0PH4rJS1jkuxjh9jSVS6+JgTGr+IwgO9S1K 19Zv3IwLImby9As3jfFNnhmODWGt6SnUQBLDUNq28AI89WxLQY10x23k0QwtvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697494473; a=rsa-sha256; cv=none; b=aT5IcjcumPefPie+9dVtfYpRnbklTaoI8zDPvbXwVMsOXVRGulVi5WjZMD69g2HpXhvy1v pCHTPzrv2TxJtjypLYKma2folPhfg7r2D893gmF5412M6fbKd76aCbmqrqJNTW2HbmZVUL dtG4Pl5YkD396qnNA1LbYl0Y46ROnIDSs+V0S2IVjITcdh4V3v+r/Ry9QvW+QSQ5mw/YvN ID63r6s148Q68X/UX5ZthH+562mxDZOzl/ZEI5VXOBDn4GEOvqNgzZnt0yCo7Yyh0DxzOS 6+ABXvRS9iJ4SMSD1j4HjwTUHRxx10Yrd/Re4U0pJ2/435wtQetTjVwcQDfcrQ== 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=1697494473; 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=xFQy/JRtLwkQ5/oYe6Iq2BlYCMPfRwAU6JOLLX8PVuc=; b=fTLdCnoDc2fXMNC6AZAbgfZvNs7ULVuPjC4TqUIxmOlVWjMYeRNtOspIM5tb3IzW2cVUbx FDwVz1sZituo2dd249vECo4B02oved3PYmnvxo8orgvirEj2MnLDS8qorh9rtr5chcUnAc YOqPZWMI5fLXmeVpndEykZtZMj3MVvsQ6Ux1EwuUBYUYzl7lSxV3+hBD2wRVBgiQ135yeG pSRXyT+WWKoa7JADoj5iMaGaSvTUit+4ESKH/c7KpVzfYYf01YsBcQVDr8HUT2Pgb8H5IW eusQwM3DCA8ZiJJ70Vc1fBFgvS6G4SkNeVNiPzeZ98atdkx+0uXb5af5LwWBfQ== 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 4S8WcT4dXnzy6s; Mon, 16 Oct 2023 22:14:33 +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 39GMEXko062641; Mon, 16 Oct 2023 22:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMEXtg062639; Mon, 16 Oct 2023 22:14:33 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:14:33 GMT Message-Id: <202310162214.39GMEXtg062639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5307bbcc038f - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5307bbcc038f878b4b3714f03a2c824a0caeba4f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5307bbcc038f878b4b3714f03a2c824a0caeba4f commit 5307bbcc038f878b4b3714f03a2c824a0caeba4f Author: John Baldwin AuthorDate: 2023-10-16 22:13:31 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:13:31 +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 --- 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 668824725ac8..bb2580789fe8 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 {