Add a new mode to the scripted partition editor for variant disk names.

If the disk parameter "DEFAULT" is set in place of an actual device name,
or no disk is specified for the PARTITIONS parameter, the installer will
follow the logic used in the automatic-partitioning mode, in which it
will either provide a selection dialog for one of several disks if
several are present or automatically select it if there is only one. This
simplifies the creation of fully-automatic installation media for
hardware or VMs with varying disk names.

Suggested by:	Egoitz Aurrekoetxea <egoitz@sarenet.es>
MFC after:	3 weeks
Relnotes:	yes

3 files changed, 11 insertions, 7 deletions

diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c
index 3160e1f049ea..9f7158a4801e 100644
--- a/usr.sbin/bsdinstall/partedit/part_wizard.c
+++ b/usr.sbin/bsdinstall/partedit/part_wizard.c
@@ -44,7 +44,6 @@
 #define MIN_FREE_SPACE		(1024*1024*1024) /* 1 GB */
 #define SWAP_SIZE(available)	MIN(available/20, 4*1024*1024*1024LL)
 
-static char *boot_disk(struct gmesh *mesh);
 static char *wizard_partition(struct gmesh *mesh, const char *disk);
 
 int
@@ -65,7 +64,7 @@ startwizard:
 
 	dlg_put_backtitle();
 	error = geom_gettree(&mesh);
-	disk = boot_disk(&mesh);
+	disk = boot_disk_select(&mesh);
 	if (disk == NULL)
 		return (1);
 
@@ -91,8 +90,8 @@ startwizard:
 	return (0);
 }
 
-static char *
-boot_disk(struct gmesh *mesh)
+char *
+boot_disk_select(struct gmesh *mesh)
 {
 	struct gclass *classp;
 	struct gconfig *gc;
diff --git a/usr.sbin/bsdinstall/partedit/partedit.h b/usr.sbin/bsdinstall/partedit/partedit.h
index e989decc2359..20d2047c1408 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.h
+++ b/usr.sbin/bsdinstall/partedit/partedit.h
@@ -60,6 +60,7 @@ void delete_part_metadata(const char *name);
 
 int part_wizard(const char *fstype);
 int scripted_editor(int argc, const char **argv);
+char *boot_disk_select(struct gmesh *mesh);
 int wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype,
     int interactive);
 
diff --git a/usr.sbin/bsdinstall/partedit/scripted.c b/usr.sbin/bsdinstall/partedit/scripted.c
index 57dcbca816a3..37ac6de131b5 100644
--- a/usr.sbin/bsdinstall/partedit/scripted.c
+++ b/usr.sbin/bsdinstall/partedit/scripted.c
@@ -183,10 +183,14 @@ int parse_disk_config(char *input)
 		}
 	} while (input != NULL && *input != 0);
 
-	if (disk != NULL)
-		return (part_config(disk, scheme, partconfig));
+	if (disk == NULL || strcmp(disk, "DEFAULT") == 0) {
+		struct gmesh mesh;
+		geom_gettree(&mesh);
+		disk = boot_disk_select(&mesh);
+		geom_deletetree(&mesh);
+	}
 
-	return (0);
+	return (part_config(disk, scheme, partconfig));
 }
 
 int