Date: Thu, 19 Oct 2023 19:47:47 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: bfbb28f3b1b6 - stable/14 - bsdinstall partedit: Apply changes from scripted installs Message-ID: <202310191947.39JJllgc010873@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bfbb28f3b1b659805364eea580033b4b3afcc0eb commit bfbb28f3b1b659805364eea580033b4b3afcc0eb Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2023-10-16 22:13:31 +0000 Commit: John Baldwin <jhb@FreeBSD.org> 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 <andrey@bsdnir.info> Reported by: Michal Nowak <mnowak@startmail.com> 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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310191947.39JJllgc010873>