1. Add a noWarn flag so that scripts can turn warnings off.

2. If hostname not set from script, bring up interactive dialog anyway.

3 files changed, 11 insertions, 5 deletions

diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index 115e578..97ab300 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.86 1997/06/05 09:47:55 jkh Exp $
+ * $Id: disks.c,v 1.87 1997/06/12 08:46:50 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -256,7 +256,7 @@ diskPartition(Device *dev, Disk *d)
 		rv = msgYesNo("Do you want to do this with a true partition entry\n"
 			      "so as to remain cooperative with any future possible\n"
 			      "operating systems on the drive(s)?");
-		if (rv != 0 && (!cp || strcasecmp(cp, "nowarn"))) {
+		if (rv != 0 && (!cp || strcasecmp(cp, "nowarn")) && !variable_get(VAR_NO_WARN)) {
 		    rv = !msgYesNo("This is dangerous in that it will make the drive totally\n"
 				   "uncooperative with other potential operating systems on the\n"
 				   "same disk.  It will lead instead to a totally dedicated disk,\n"
@@ -455,7 +455,8 @@ diskPartition(Device *dev, Disk *d)
 	dialog_clear_norefresh();
         use_helpline("Press F1 to read more about disk slices.");
 	use_helpfile(systemHelpFile("partition", buf));
-	dialog_mesgbox("Disk slicing warning:", p, -1, -1);
+	if (!variable_get(VAR_NO_WARN))
+	    dialog_mesgbox("Disk slicing warning:", p, -1, -1);
 	free(p);
     }
     restorescr(w);
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 0557f21..314fea4 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.187 1997/05/30 01:03:09 jkh Exp $
+ * $Id: install.c,v 1.188 1997/06/13 07:11:54 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -70,6 +70,10 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd
     Chunk *c1, *c2, *rootdev, *swapdev, *usrdev, *vardev;
     int i;
 
+    /* Don't allow whinging if noWarn is set */
+    if (variable_get(VAR_NO_WARN))
+	whinge = FALSE;
+
     status = TRUE;
     *rdev = *sdev = *udev = *vdev = rootdev = swapdev = usrdev = vardev = NULL;
 
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 4f60d63..204ad3d 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.133 1997/06/13 14:21:21 jkh Exp $
+ * $Id: sysinstall.h,v 1.134 1997/06/13 17:55:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -135,6 +135,7 @@
 #define VAR_NFS_SECURE			"nfsSecure"
 #define VAR_NFS_SERVER			"nfs_server_enable"
 #define VAR_NO_CONFIRM			"noConfirm"
+#define VAR_NO_WARN			"noWarn"
 #define VAR_NONINTERACTIVE		"nonInteractive"
 #define VAR_NOVELL			"novell"
 #define VAR_PARTITION			"partition"