The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5307bbcc038f878b4b3714f03a2c824a0caeba4f
commit 5307bbcc038f878b4b3714f03a2c824a0caeba4f
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2023-10-16 22:13:31 +0000
Commit: John Baldwin <j...@freebsd.org>
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 <and...@bsdnir.info>
Reported by: Michal Nowak <mno...@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
---
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 {
