MF22: Paul Traina's changes.

1 files changed, 12 insertions, 6 deletions

diff --git a/usr.sbin/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c
index ec3f70c..ec87289 100644
--- a/usr.sbin/sysinstall/floppy.c
+++ b/usr.sbin/sysinstall/floppy.c
@@ -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: floppy.c,v 1.27 1998/02/08 20:18:19 jkh Exp $
+ * $Id: floppy.c,v 1.28 1998/02/10 18:31:22 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -73,10 +73,14 @@ mediaInitFloppy(Device *dev)
     }
 
     msgDebug("Init floppy called for %s distribution.\n", distWanted ? distWanted : "some");
-    if (!distWanted)
-    	msgConfirm("Please insert floppy in %s", dev->description);
-    else
-	msgConfirm("Please insert floppy containing %s in %s", distWanted, dev->description);
+
+    if (!variable_get(VAR_NONINTERACTIVE)) {
+	if (!distWanted)
+	    msgConfirm("Please insert floppy in %s", dev->description);
+	else
+	    msgConfirm("Please insert floppy containing %s in %s",
+			distWanted, dev->description);
+    }
 
     memset(&dosargs, 0, sizeof dosargs);
     dosargs.fspec = dev->devname;
@@ -141,7 +145,9 @@ mediaShutdownFloppy(Device *dev)
 	else {
 	    floppyMounted = FALSE;
 	    msgDebug("Floppy unmounted successfully.\n");
-	    msgConfirm("You may remove the floppy from %s", dev->description);
+	    if (!variable_get(VAR_NONINTERACTIVE))
+		msgConfirm("You may remove the floppy from %s",
+			   dev->description);
 	}
     }
 }