Sync with HEAD.

7 files changed, 323 insertions, 18 deletions

diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index 9618b09..b7f5097 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -2,7 +2,9 @@
 
 BINDIR= /usr/libexec/bsdinstall
 PROG=	partedit
-LINKS= ${BINDIR}/partedit ${BINDIR}/autopart
+LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
+       ${BINDIR}/partedit ${BINDIR}/scriptedpart
+SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade
 LDADD=	-lgeom -lncursesw -lutil -ldialog -lm
 
 PARTEDIT_ARCH= ${MACHINE}
@@ -14,9 +16,9 @@ PARTEDIT_ARCH= generic
 .endif
 
 SRCS=	diskeditor.c partedit.c gpart_ops.c partedit_${PARTEDIT_ARCH}.c \
-	part_wizard.c
+	part_wizard.c scripted.c
 
 WARNS?=	3
-NO_MAN=	true
+MAN= sade.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/partedit/diskeditor.c b/usr.sbin/bsdinstall/partedit/diskeditor.c
index 7933caa..9149c2b 100644
--- a/usr.sbin/bsdinstall/partedit/diskeditor.c
+++ b/usr.sbin/bsdinstall/partedit/diskeditor.c
@@ -77,7 +77,7 @@ diskeditor_show(const char *title, const char *cprompt,
 	int partlist_height, partlist_width;
 	int cur_scroll = 0;
 	int key, fkey;
-	int cur_button = 0, cur_part = 0;
+	int cur_button = 5, cur_part = 0;
 	int result = DLG_EXIT_UNKNOWN;
 
 	static DLG_KEYS_BINDING binding[] = {
diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c
index e840ac9..a304fb8 100644
--- a/usr.sbin/bsdinstall/partedit/part_wizard.c
+++ b/usr.sbin/bsdinstall/partedit/part_wizard.c
@@ -42,7 +42,6 @@
 
 static char *boot_disk(struct gmesh *mesh);
 static char *wizard_partition(struct gmesh *mesh, const char *disk);
-static int wizard_makeparts(struct gmesh *mesh, const char *disk);
 
 int
 part_wizard(void) {
@@ -71,7 +70,7 @@ startwizard:
 	dlg_put_backtitle();
 	error = geom_gettree(&mesh);
 
-	error = wizard_makeparts(&mesh, schemeroot);
+	error = wizard_makeparts(&mesh, schemeroot, 1);
 	if (error)
 		goto startwizard;
 	free(schemeroot);
@@ -168,12 +167,6 @@ provider_for_name(struct gmesh *mesh, const char *name)
 	struct ggeom *gp;
 
 	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
-		if (strcmp(classp->lg_name, "DISK") != 0 &&
-		    strcmp(classp->lg_name, "PART") != 0 &&
-		    strcmp(classp->lg_name, "RAID") != 0 &&
-		    strcmp(classp->lg_name, "MD") != 0)
-			continue;
-
 		LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
 			if (LIST_EMPTY(&gp->lg_provider))
 				continue;
@@ -288,8 +281,8 @@ query:
 	return (retval);
 }
 
-static int
-wizard_makeparts(struct gmesh *mesh, const char *disk)
+int
+wizard_makeparts(struct gmesh *mesh, const char *disk, int interactive)
 {
 	struct gmesh submesh;
 	struct gclass *classp;
@@ -310,7 +303,7 @@ wizard_makeparts(struct gmesh *mesh, const char *disk)
 	pp = provider_for_name(mesh, disk);
 
 	available = gpart_max_free(gp, NULL)*pp->lg_sectorsize;
-	if (available < MIN_FREE_SPACE) {
+	if (interactive && available < MIN_FREE_SPACE) {
 		char availablestr[10], neededstr[10], message[512];
 		humanize_number(availablestr, 7, available, "B", HN_AUTOSCALE,
 		    HN_DECIMAL);
diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c
index 2436f08..eff87fe 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.c
+++ b/usr.sbin/bsdinstall/partedit/partedit.c
@@ -41,6 +41,7 @@
 #include "partedit.h"
 
 struct pmetadata_head part_metadata;
+static int sade_mode = 0;
 
 static int apply_changes(struct gmesh *mesh);
 static struct partedit_item *read_geom_mesh(struct gmesh *mesh, int *nitems);
@@ -75,12 +76,15 @@ main(int argc, const char **argv)
 	int i, op, nitems, nscroll;
 	int error;
 
+	if (strcmp(basename(argv[0]), "sade") == 0)
+		sade_mode = 1;
+
 	TAILQ_INIT(&part_metadata);
 
 	init_fstab_metadata();
 
 	init_dialog(stdin, stdout);
-	if (strcmp(basename(argv[0]), "sade") != 0)
+	if (!sade_mode)
 		dialog_vars.backtitle = __DECONST(char *, "FreeBSD Installer");
 	dialog_vars.item_help = TRUE;
 	nscroll = i = 0;
@@ -92,13 +96,20 @@ main(int argc, const char **argv)
 		prompt = "Please review the disk setup. When complete, press "
 		    "the Finish button.";
 		part_wizard();
+	} else if (strcmp(basename(argv[0]), "scriptedpart") == 0) {
+		error = scripted_editor(argc, argv);
+		prompt = NULL;
+		if (error != 0) {
+			end_dialog();
+			return (error);
+		}
 	} else {
 		prompt = "Create partitions for FreeBSD. No changes will be "
 		    "made until you select Finish.";
 	}
 
 	/* Show the part editor either immediately, or to confirm wizard */
-	while (1) {
+	while (prompt != NULL) {
 		dlg_clear();
 		dlg_put_backtitle();
 
@@ -185,6 +196,15 @@ main(int argc, const char **argv)
 		free(items);
 	}
 	
+	if (prompt == NULL) {
+		error = geom_gettree(&mesh);
+		if (validate_setup()) {
+			error = apply_changes(&mesh);
+		} else {
+			gpart_revert_all(&mesh);
+			error = -1;
+		}
+	}
 
 	geom_deletetree(&mesh);
 	free(items);
@@ -261,7 +281,7 @@ validate_setup(void)
 	 * Check for root partitions that we aren't formatting, which is 
 	 * usually a mistake
 	 */
-	if (root->newfs == NULL) {
+	if (root->newfs == NULL && !sade_mode) {
 		dialog_vars.defaultno = TRUE;
 		cancel = dialog_yesno("Warning", "The chosen root partition "
 		    "has a preexisting filesystem. If it contains an existing "
diff --git a/usr.sbin/bsdinstall/partedit/partedit.h b/usr.sbin/bsdinstall/partedit/partedit.h
index bffb076..121e3a2 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.h
+++ b/usr.sbin/bsdinstall/partedit/partedit.h
@@ -55,6 +55,8 @@ struct partition_metadata *get_part_metadata(const char *name, int create);
 void delete_part_metadata(const char *name);
 
 int part_wizard(void);
+int scripted_editor(int argc, const char **argv);
+int wizard_makeparts(struct gmesh *mesh, const char *disk, int interactive);
 
 /* gpart operations */
 void gpart_delete(struct gprovider *pp);
diff --git a/usr.sbin/bsdinstall/partedit/sade.8 b/usr.sbin/bsdinstall/partedit/sade.8
new file mode 100644
index 0000000..441ddc0
--- /dev/null
+++ b/usr.sbin/bsdinstall/partedit/sade.8
@@ -0,0 +1,75 @@
+.\" Copyright (c) 1997
+.\"	Jordan Hubbard <jkh@FreeBSD.org>.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY Jordan Hubbard AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL Jordan Hubbard OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd December 30, 2012
+.Dt SADE 8
+.Os
+.Sh NAME
+.Nm sade
+.Nd sysadmins disk editor
+.Sh SYNOPSIS
+.Nm
+.Sh DESCRIPTION
+The
+.Nm
+utility is used for various disk administration tasks on
+.Fx
+systems.
+.Pp
+It is generally invoked without arguments for the default
+behavior, where the main menu is presented.
+.Sh NOTES
+The
+.Nm
+utility aims to provide a handy tool for disk management
+tasks on an already installed system.
+The goal is to provide the same text interface for disk management in
+.Xr bsdinstall 8
+in the post-installation environment.
+.Sh SEE ALSO
+.Xr bsdinstall 8 ,
+.Xr gpart 8
+.Sh HISTORY
+A program called
+.Nm
+first appeared in
+.Fx 6.3
+as a utility encapsulating features from the
+.Xr sysinstall 8
+installer. It was replaced in
+.Fx 10.0
+with the equivalent part of
+.Xr bsdinstall 8 .
+.Sh AUTHORS
+.An Nathan Whitehorn Aq nwhitehorn@FreeBSD.org
+.Sh BUGS
+The utility misses a lot of nice features, such as tools for
+manipulating
+.Xr gmirror 8
+or
+.Xr zfs 8
+.
+These will be added later.
diff --git a/usr.sbin/bsdinstall/partedit/scripted.c b/usr.sbin/bsdinstall/partedit/scripted.c
new file mode 100644
index 0000000..4ac3482
--- /dev/null
+++ b/usr.sbin/bsdinstall/partedit/scripted.c
@@ -0,0 +1,213 @@
+/*-
+ * Copyright (c) 2013 Nathan Whitehorn
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/param.h>
+#include <errno.h>
+#include <libutil.h>
+#include <inttypes.h>
+
+#include <libgeom.h>
+#include <dialog.h>
+#include <dlg_keys.h>
+
+#include "partedit.h"
+
+static struct gprovider *
+provider_for_name(struct gmesh *mesh, const char *name)
+{
+	struct gclass *classp;
+	struct gprovider *pp = NULL;
+	struct ggeom *gp;
+
+	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
+		LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
+			if (LIST_EMPTY(&gp->lg_provider))
+				continue;
+
+			LIST_FOREACH(pp, &gp->lg_provider, lg_provider)
+				if (strcmp(pp->lg_name, name) == 0)
+					break;
+
+			if (pp != NULL) break;
+		}
+
+		if (pp != NULL) break;
+	}
+
+	return (pp);
+}
+
+static int
+part_config(char *disk, const char *scheme, char *config)
+{
+	char *partition, *ap, *size = NULL, *type = NULL, *mount = NULL;
+	struct gclass *classp;
+	struct gmesh mesh;
+	struct ggeom *gpart = NULL;
+	int error;
+
+	if (scheme == NULL)
+		scheme = default_scheme();
+
+	error = geom_gettree(&mesh);
+	if (provider_for_name(&mesh, disk) == NULL) {
+		fprintf(stderr, "GEOM provider %s not found\n", disk);
+		geom_deletetree(&mesh);
+		return (-1);
+	}
+
+	/* Remove any existing partitioning and create new scheme */
+	LIST_FOREACH(classp, &mesh.lg_class, lg_class)
+		if (strcmp(classp->lg_name, "PART") == 0)
+			break;
+        if (classp != NULL) {
+		LIST_FOREACH(gpart, &classp->lg_geom, lg_geom)
+		if (strcmp(gpart->lg_name, disk) == 0)
+			break;
+	}
+	if (gpart != NULL)
+		gpart_destroy(gpart);
+	gpart_partition(disk, scheme);
+
+	if (strcmp(scheme, "PC98") == 0 || strcmp(scheme, "MBR") == 0) {
+		struct gmesh submesh;
+		geom_gettree(&submesh);
+		gpart_create(provider_for_name(&submesh, disk),
+		    "freebsd", NULL, NULL, &disk, 0);
+		geom_deletetree(&submesh);
+	} else {
+		disk= strdup(disk);
+	}
+
+	geom_deletetree(&mesh);
+	error = geom_gettree(&mesh);
+
+	/* Create partitions */
+	if (config == NULL) {
+		wizard_makeparts(&mesh, disk, 0);
+		goto finished;
+	}
+
+	while ((partition = strsep(&config, ",")) != NULL) {
+		while ((ap = strsep(&partition, " \t\n")) != NULL) {
+			if (*ap == '\0')
+				continue;
+			if (size == NULL)
+				size = ap;
+			else if (type == NULL)
+				type = ap;
+			else if (mount == NULL)
+				mount = ap;
+		}
+		if (size == NULL)
+			continue;
+		if (strcmp(size, "auto") == 0)
+			size = NULL;
+		gpart_create(provider_for_name(&mesh, disk), type, size, mount,
+		    NULL, 0);
+		geom_deletetree(&mesh);
+		error = geom_gettree(&mesh);
+		size = type = mount = NULL;
+	}
+
+finished:
+	geom_deletetree(&mesh);
+	free(disk);
+
+	return (0);
+}
+
+static
+int parse_disk_config(char *input)
+{
+	char *ap;
+	char *disk = NULL, *scheme = NULL, *partconfig = NULL;
+
+	while (input != NULL && *input != 0) {
+		if (isspace(*input)) {
+			input++;
+			continue;
+		}
+
+		switch(*input) {
+		case '{':
+			input++;
+			partconfig = strchr(input, '}');
+			if (partconfig == NULL) {
+				fprintf(stderr, "Malformed partition setup "
+				    "string: %s\n", input);
+				return (1);
+			}
+			*partconfig = '\0';
+			ap = partconfig+1;
+			partconfig = input;
+			input = ap;
+			break;
+		default:
+			if (disk == NULL)
+				disk = strsep(&input, " \t\n");
+			else if (scheme == NULL)
+				scheme = strsep(&input, " \t\n");
+			else {
+				fprintf(stderr, "Unknown directive: %s\n",
+				    strsep(&input, " \t\n"));
+				return (1);
+			}
+		}
+	} while (input != NULL && *input != 0);
+
+	if (disk != NULL)
+		return (part_config(disk, scheme, partconfig));
+
+	return (0);
+}
+
+int
+scripted_editor(int argc, const char **argv)
+{
+	char *token;
+	int i, error = 0, len = 0;
+
+	for (i = 1; i < argc; i++)
+		len += strlen(argv[i]) + 1;
+	char inputbuf[len], *input = inputbuf;
+	strcpy(input, argv[1]);
+	for (i = 2; i < argc; i++) {
+		strcat(input, " ");
+		strcat(input, argv[i]);
+	}
+
+	while ((token = strsep(&input, ";")) != NULL) {
+		error = parse_disk_config(token);
+		if (error != 0)
+			return (error);
+	}
+
+	return (0);
+}
+