aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/bsdinstall/partedit
diff options
context:
space:
mode:
authorAlfonso S. Siciliano <asiciliano@FreeBSD.org>2022-04-29 23:19:30 +0000
committerAlfonso S. Siciliano <asiciliano@FreeBSD.org>2022-04-29 23:24:23 +0000
commit9b4c606b96ce8a8b011dc50295c71c38741a0f4f (patch)
treed85f4f3729c6fbaefb0c42cc19c75007f3bb9898 /usr.sbin/bsdinstall/partedit
parent2f6362484c0e1250ef6a76cccdbe4a95587e850c (diff)
bsdinstall/partedit: Fix UFS auto partitioning
Fix bsdinstall "Auto (UFS) Guided Disk Setup" and sade(8) "Auto". The problem is a string comparison failure, it arose during the dialog(3)/bsddialog(3) form conversion: * dialog uses only form.text while bsdialog differentiates between form.init and form.value. * dialog always allocates memory for form values while bsddialog only when a button is pressed. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D35033
Diffstat (limited to 'usr.sbin/bsdinstall/partedit')
-rw-r--r--usr.sbin/bsdinstall/partedit/gpart_ops.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c
index 65cda247e146..26aedb58ef39 100644
--- a/usr.sbin/bsdinstall/partedit/gpart_ops.c
+++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c
@@ -1154,6 +1154,12 @@ addpartform:
init_allocated = true;
goto addpartform;
}
+ } else { /* auto partitioning */
+ items[0].value = strdup(items[0].init);
+ items[1].value = strdup(items[1].init);
+ items[2].value = strdup(items[2].init);
+ if (nitems > 3)
+ items[3].value = strdup(items[3].init);
}
/*