upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bsdinstall partedit: Apply changes from scripted installs

Browse source 
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:		2309909919 bsdinstall: Handle errors from geom_gettree.
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D42236

(cherry picked from commit 5307bbcc03)
This commit is contained in:
John Baldwin 2023-10-16 15:13:31 -07:00
parent e26b7e8d02
commit bfbb28f3b1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr.sbin/bsdinstall/partedit/partedit.c
View file

@ -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 {