From nobody Thu Oct 19 19:47:47 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 4SBJCl4952z4xpPk; Thu, 19 Oct 2023 19:47:47 +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 4SBJCl2bxRz3g9m; Thu, 19 Oct 2023 19:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697744867; 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=DrvjqynIbY7Vudax4LNCNQTNTImLYBJjLma8ezEmq1s=; b=nCcMaJrx/CbR8ihsAKztTEnXa1bkXEXvCqVv5wt8BhXQTX+G1VnRMe65dlSesFSH1xZ7Ao QG7d5wrK1Ak30fHEL0Qj8SccHO9UKcpQaZv7xtzuXv96PXb4Iz4yJRp0KP4WPuV9Lx1MQA g53loyinN0HN+90qdcpZylLEXA1vnk36/1Cngo54WJALmz0O+t71wAF9gytR7/pgOMNbfp zsDWhHZDGQnZZ6gELSxjXi8qTPk1O9idR0fgAsDP0CL+ANUEsb5/hMSYFKsNGVaGLf9cCC JvJ78NebyWmwSjjW4VU3evdt/BH3Ss/xzse0zBBUF7R3YceNjSSeC/L0Mbuj0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697744867; a=rsa-sha256; cv=none; b=YANlBSiN+OYEpdZEkwpkM2Ew/NvNvBMGD7qTn2OkSHV9Vy/04srBuBZoIRD9+0T7chlh1y Iq/0FL90OB8l6aXyjzwvgHpMwjk2UQ6u69DurqrXUmza4DseeRqJk6/9NkaiL8IXCH+mgC TamI1AiWmzLHzTYkwKLPM31XBbiIvVurWekZsO41+gyCpSPy1d8Ouzi+So1WypoCl7C/w8 IabRi+9Q4Jjyfr2Z9s0/VAx2p2I7JANcBZlpdLqZwdtWQ+SlqRpWv5YT8IBhwCMvIWP+Fo j2cKneQnvsE4amUYT8a3EJgM21zk/JXKp1GrAQwF63Qa3jFINikygmKIJj0uEQ== 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=1697744867; 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=DrvjqynIbY7Vudax4LNCNQTNTImLYBJjLma8ezEmq1s=; b=aq9UlQxBSZWv4mM7OSXDp3pl9tqc29sLS4+vbXhkHuUm9WLnv5XDCIhHIjw7DDdniW9c45 ktF7NzyhE6jTjcI8lYGtaUbNQk0STO6PQnnrohUIJrWvIXuOtxzoB04Z7A1BMdTia6MzmA mGLyotnjCEtVTMXdSZGowbBGRBywXxREg4qcSifWtv6L8M3FHD1ssO8QdEbnwwI81goefa MJ6wULktKlIRwG0buCkAsexml6OJ9id95NsMcNeW1DzWHptSXBUIqv4iqdYp52rSfkUUqU vu5Yv5ho9TdNvNMFaeBLeCnHwQwGkmCQm+mu47YR54RwXFaJb+p+544bK/LYSQ== 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 4SBJCl1V3Sz131f; Thu, 19 Oct 2023 19:47:47 +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 39JJllFm010876; Thu, 19 Oct 2023 19:47:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JJllgc010873; Thu, 19 Oct 2023 19:47:47 GMT (envelope-from git) Date: Thu, 19 Oct 2023 19:47:47 GMT Message-Id: <202310191947.39JJllgc010873@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: bfbb28f3b1b6 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: bfbb28f3b1b659805364eea580033b4b3afcc0eb Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bfbb28f3b1b659805364eea580033b4b3afcc0eb commit bfbb28f3b1b659805364eea580033b4b3afcc0eb Author: John Baldwin AuthorDate: 2023-10-16 22:13:31 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:59:57 +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) --- 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 {