From nobody Fri Jan 05 00:23:06 2024 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 4T5kgv1j27z55fPR; Fri, 5 Jan 2024 00:23:07 +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 4T5kgv08Srz4dY7; Fri, 5 Jan 2024 00:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704414187; 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=vv2HB+CxDw3siQmzq6mbRZH2paKhmC1g07B98m658Fs=; b=POBHLJKalfNuIJoK3NZOFt16r6A09B6XNYDKlbtX2w83xQY1QU5LHwD1AzeCNbPwbYdVxz 48ZWUDrKDqAeWUTVVLQBJO5HwxylShja2kmU5lOe/bNG2wSe/DoZLS5FNk9WlLitoS6ITf xUGaUKqfb2iUoqVOJ7B/YICGDsZBWOKh61KwXr1mEhry1g5GgE3AU/Ieiu/3cggSGpQI3F mwp6My2jbgYefS5rmsVxMxU3mh3DHoKzEkugr8p1gE8YlURvn+23O3c0QVVnfCTOYMGqkx QA4V4kP1KUGdwvsuM4jcZl7N39OOdMfL5odPAFSuFChdT0AjAsiQpsQpHt3OGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704414187; 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=vv2HB+CxDw3siQmzq6mbRZH2paKhmC1g07B98m658Fs=; b=Wv1AyliYb9x3rKHPYxoCQQrRjndTNUKn2DjeuCJ6V6y4paPE+STzvdYC1cpqH2XGnW2F5W 1PvSJjXy70V7pK7KfpfhuHyOtnd3Fqq3wwPOz7Pk4as0UU9f9tNRYG4ecjEWbQsQoE2Lcm WTTbkGeGMFSiPmAjyX6/jWEz6wCP5ifgGQj/8iUFDfeMZE70r0FN3+Pnv/jCCTOJ3SS6Tw 39DyZu0lPN3KcHoN2umNVV8APEjNWN+jZu1CViJsYHOU764/WaAtgZS1xt3f9psDYxTS/w SnvxhpujYiL9v3ZzW+X8jCPJz3fqE6MVlTODqph9A8pIYlgzXwzP/BQBfb3QJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704414187; a=rsa-sha256; cv=none; b=sJQUWgTB2Fti6Re2YX4BPbCWvoPOQyB5l8yzuNXtnCZFa+6IcsMjXisn0bvLCWSOV1pxu9 LkbQcI7CIl+oloSegRsEL9LUyGm6Q1/dl9eO6Bgib96N2Wq6sodsbIlKDc+8W33/d/kfsL fJyBXDeRGFfQxU3sUGHs4j52kfh7PEm/SDTfw5xymTZY2MA7t93OiRcBu5KcBRSaV+gocS 3Omd9axVOt1EgaTYvYSlZCkBC9h6SY9jvzO74sgQt5egCYiikYpO3Z8mL+njKw5MOKpC8+ WPNw4oCaJVewmWIOToT32d/jJpx9E7Yh66rTK6ZvjvUiMIcNlUOKccj2ZkajkQ== 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 4T5kgt4kZbzbp8; Fri, 5 Jan 2024 00:23: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 4050N6nB025305; Fri, 5 Jan 2024 00:23:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4050N6gw025302; Fri, 5 Jan 2024 00:23:06 GMT (envelope-from git) Date: Fri, 5 Jan 2024 00:23:06 GMT Message-Id: <202401050023.4050N6gw025302@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: c81bdb499868 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c81bdb4998683aa6b795b6e1cb294be6f493329d Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c81bdb4998683aa6b795b6e1cb294be6f493329d commit c81bdb4998683aa6b795b6e1cb294be6f493329d Author: John Baldwin AuthorDate: 2023-10-16 22:13:31 +0000 Commit: John Baldwin CommitDate: 2024-01-04 23:43:33 +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 0f341cbaba12..ffc809507b08 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -210,7 +210,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 {