[Midnightbsd-cvs] src [8941] trunk/usr.sbin/bsdinstall/partedit: fixes for sade mode

[laffer1 at midnightbsd.org]

Revision: 8941
          http://svnweb.midnightbsd.org/src/?rev=8941
Author:   laffer1
Date:     2016-09-26 19:11:16 -0400 (Mon, 26 Sep 2016)
Log Message:
-----------
fixes for sade mode

Modified Paths:
--------------
    trunk/usr.sbin/bsdinstall/partedit/gpart_ops.c
    trunk/usr.sbin/bsdinstall/partedit/partedit.c

Modified: trunk/usr.sbin/bsdinstall/partedit/gpart_ops.c
===================================================================
--- trunk/usr.sbin/bsdinstall/partedit/gpart_ops.c	2016-09-26 23:07:19 UTC (rev 8940)
+++ trunk/usr.sbin/bsdinstall/partedit/gpart_ops.c	2016-09-26 23:11:16 UTC (rev 8941)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD: src/usr.sbin/bsdinstall/partedit/gpart_ops.c,v 1.5 2013/04/06 04:41:31 laffer1 Exp $
+ * $MidnightBSD$
  * $FreeBSD: src/usr.sbin/bsdinstall/partedit/gpart_ops.c,v 1.10 2011/10/23 16:57:10 nwhitehorn Exp $
  */
 
@@ -146,7 +146,7 @@
 				strcat(command, "-F 32 ");
 			else if (strcmp(items[i].name, "FAT16") == 0)
 				strcat(command, "-F 16 ");
-			else if (strcmp(items[i].name, "SUJ") == 0)
+			else if (strcmp(items[i].name, "FAT12") == 0)
 				strcat(command, "-F 12 ");
 		}
 	} else {

Modified: trunk/usr.sbin/bsdinstall/partedit/partedit.c
===================================================================
--- trunk/usr.sbin/bsdinstall/partedit/partedit.c	2016-09-26 23:07:19 UTC (rev 8940)
+++ trunk/usr.sbin/bsdinstall/partedit/partedit.c	2016-09-26 23:11:16 UTC (rev 8941)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD: src/usr.sbin/bsdinstall/partedit/partedit.c,v 1.2 2013/01/19 23:30:56 laffer1 Exp $
+ * $MidnightBSD$
  * $FreeBSD: src/usr.sbin/bsdinstall/partedit/partedit.c,v 1.5 2011/10/25 16:30:16 nwhitehorn Exp $
  */
 
@@ -42,6 +42,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);
@@ -76,12 +77,15 @@
 	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 *, "MidnightBSD Installer");
 	dialog_vars.item_help = TRUE;
 	nscroll = i = 0;
@@ -262,7 +266,7 @@
 	 * 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 "