Bring this into sync.

I still have a _very very annoying_ display bug which occurs when a menu
item causes a submenu to be displayed - the screen repaints for the original
menu (which is restored upon return from the submenu) are off by about 4
characters.  I've tried restoring the screen, the cursor position, you name
it - same deal.  Grrrr!  This commit is my first step in trying to get someone
else to help me look into this one since I'm just tearing my hair out at this
point!

1 files changed, 2 insertions, 7 deletions

diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 83c38da..5e1dbcf 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.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: cdrom.c,v 1.11 1996/03/18 15:27:43 jkh Exp $
+ * $Id: cdrom.c,v 1.12 1996/04/13 13:31:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -81,7 +81,6 @@ mediaInitCDROM(Device *dev)
     if (directory_exists("/cdrom/dists"))
 	cdromMounted = 2;
     else if (mount(MOUNT_CD9660, "/cdrom", MNT_RDONLY, (caddr_t) &args) == -1) {
-	dialog_clear();
 	msgConfirm("Error mounting %s on /cdrom: %s (%u)", dev->devname, strerror(errno), errno);
 	return FALSE;
     }
@@ -93,14 +92,12 @@ mediaInitCDROM(Device *dev)
     snprintf(specialrel, 80, "/cdrom/%s/dists", variable_get(VAR_RELNAME));
     if (stat("/cdrom/dists", &sb) && stat(specialrel, &sb)) {
 	if (errno == ENOENT) {
-	    dialog_clear();
 	    msgConfirm("Couldn't locate the directory `dists' anywhere on the CD.\n"
 		       "Is this a FreeBSD CDROM?  Is the release version set properly\n"
 		       "in the Options editor?");
 	    return FALSE;
 	}
 	else {
-	    dialog_clear();
 	    msgConfirm("Error trying to stat the CDROM's dists directory: %s", strerror(errno));
 	    return FALSE;
 	}
@@ -135,10 +132,8 @@ mediaShutdownCDROM(Device *dev)
     if (!RunningAsInit || !cdromMounted || cdromMounted == 2)
 	return;
     msgDebug("Unmounting %s from /cdrom\n", dev->devname);
-    if (unmount("/cdrom", MNT_FORCE) != 0) {
-	dialog_clear();
+    if (unmount("/cdrom", MNT_FORCE) != 0)
 	msgConfirm("Could not unmount the CDROM from /cdrom: %s", strerror(errno));
-    }
     msgDebug("Unmount successful\n");
     cdromMounted = 0;
     return;