Index: usr.sbin/bsdinstall/partedit/gpart_ops.c
===================================================================
--- usr.sbin/bsdinstall/partedit/gpart_ops.c
+++ usr.sbin/bsdinstall/partedit/gpart_ops.c
@@ -715,6 +715,7 @@
 						  0600);
 			if (fd > 0) {
 				write(fd, md->name, strlen(md->name));
+				write(fd, "\n", 1);
 				close(fd);
 			}
 
Index: usr.sbin/bsdinstall/partedit/partedit.c
===================================================================
--- usr.sbin/bsdinstall/partedit/partedit.c
+++ usr.sbin/bsdinstall/partedit/partedit.c
@@ -87,6 +87,8 @@
 
 	init_fstab_metadata();
 
+	unlink("/tmp/bsdinstall-esps");
+
 	init_dialog(stdin, stdout);
 	if (!sade_mode)
 		dialog_vars.backtitle = __DECONST(char *, "FreeBSD Installer");