YAMF22

2 files changed, 57 insertions, 36 deletions

diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index bdc5bb3..4285ea7 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.92 1997/05/22 21:26:09 jkh Exp $
+ * $Id: config.c,v 1.93 1997/05/23 18:54:28 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -517,14 +517,9 @@ configXFree86(dialogMenuItem *self)
     }
 
 #else	/* USE_XIG_ENVIRONMENT */
+    int i;
 
-    /* Pre-extract base sets in kludge to work around chicken-and-egg problem with CDE and Xaccel */
-    if (directory_exists("/dist/CDE") && !file_readable("/usr/X11R6/bin/xterm")) {
-	msgNotify("Installing bootstrap X11 tools from CDE distribution.");
-	systemExecute("tar xpf /dist/CDE/FreeBSD/packages/X11-RUN/archive -C /");
-	systemExecute("tar xpf /dist/CDE/FreeBSD/packages/X11-PRG/archive -C /");
-    }
-    systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat");
+    /* Make sure we're sane first */
     if (!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall") ||
 	!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup")) {
 	dialog_clear_norefresh();
@@ -536,39 +531,64 @@ configXFree86(dialogMenuItem *self)
 		   "as the default server automatically.");
 	return DITEM_FAILURE | DITEM_RESTORE;
     }
-    else {
-	int i;
 
-	dialog_clear_norefresh();
-	msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
-	if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
-	    dialog_clear_norefresh();
-	    msgConfirm("Installation procedure failed, error code %d!  Please report\n"
-		       "error to Walnut Creek CDROM tech support (either send email\n"
-		       "to support@cdrom.com or call +1 510 603 1234).  Thank you!", i);
+    if (mediaDevice && mediaDevice->type != MEDIA_CDROM) {
+	if (DITEM_STATUS(mediaSetCDROM(NULL)) != DITEM_SUCCESS || !mediaDevice || !mediaDevice->init(mediaDevice)) {
+	    msgConfirm("I can't mount the CDE distribution from CDROM, sorry.\n"
+		       "Please make sure you have the 1st CD of your FreeBSD Desktop/Pro\n"
+		       "distribution in the drive before trying this operation.");
 	    return DITEM_FAILURE | DITEM_RESTORE;
 	}
-	else {
-	    dialog_clear();
-	    systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup");
+    }
+
+    if (!directory_exists("/dist/CDE/")) {
+	msgConfirm("Hmmm!  I can't find the CDE distribution.  Please please the 1st CD of your\n"
+		   "FreeBSD Desktop/Pro distribution in the drive and try this operation again.");
+	return DITEM_FAILURE | DITEM_RESTORE;
+    }
+
+    /* Pre-extract base sets in kludge to work around chicken-and-egg problem with CDE and Xaccel */
+    if (directory_exists("/dist/CDE/") && !file_readable("/usr/X11R6/bin/xterm")) {
+	msgNotify("Installing bootstrap X11 tools from CDE distribution.");
+	systemExecute("tar xpf /dist/CDE/FreeBSD/packages/X11-RUN/archive -C /");
+	systemExecute("tar xpf /dist/CDE/FreeBSD/packages/X11-PRG/archive -C /");
+    }
+    systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/dt/lib /usr/local/lib /usr/lib/compat");
+
+    dialog_clear_norefresh();
+    msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
+    if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
+	dialog_clear_norefresh();
+	msgConfirm("Installation procedure failed, error code %d!  Please report\n"
+		   "error to Walnut Creek CDROM tech support (either send email\n"
+		   "to support@cdrom.com or call +1 510 603 1234).  Thank you!", i);
+	return DITEM_FAILURE | DITEM_RESTORE;
+    }
+    else {
+	dialog_clear();
+	systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup");
+    }
+    if (directory_exists("/dist/CDE")) {
+	dialog_clear_norefresh();
+	msgNotify("Running CDE installation - please wait (this may take awhile!).");
+	dialog_clear();
+	clear();
+	refresh();
+	i = systemExecute("(cd /dist/CDE; sh Install)");
+	dialog_clear();
+	if (i) {
+	    msgConfirm("/dist/CDE/dtinstall script returned an error status!\n\n"
+		       "To try again, you should run this command manually after the system\n"
+		       "is up (and if your CDROM is mounted in the standard location, the path\n"
+		       "to it will actually be /cdrom/CDE/dtinstall when you run it later).\n");
 	}
-	if (directory_exists("/dist/CDE")) {
-	    dialog_clear_norefresh();
-	    msgNotify("Running CDE installation - please wait (this may take awhile!).");
-	    dialog_clear();
-	    clear();
-	    refresh();
-	    i = systemExecute("(cd /dist/CDE; sh Install)");
-	    dialog_clear();
-	    if (i) {
-		msgConfirm("/dist/CDE/dtinstall script returned an error status!\n\n"
-			   "To try again, you should run this command manually after the system\n"
-			   "is up (and if your CDROM is mounted in the standard location, the path\n"
-			   "to it will actually be /cdrom/CDE/dtinstall when you run it later).\n");
-	    }
+	else {
+	    /* Repair the damage done by the CDE installation */
+	    msgNotify("Doing final adjustments to Xaccel distribution...");
+	    systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall");
 	}
-	return DITEM_SUCCESS | DITEM_RESTORE;
     }
+    return DITEM_SUCCESS | DITEM_RESTORE;
 #endif	/* USE_XIG_ENVIRONMENT */
 }
 
diff --git a/release/sysinstall/register.c b/release/sysinstall/register.c
index 1094014..05dca53 100644
--- a/release/sysinstall/register.c
+++ b/release/sysinstall/register.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: register.c,v 1.5 1997/03/19 10:09:24 jkh Exp $
+ * $Id: register.c,v 1.6 1997/03/25 03:07:46 jkh Exp $
  *
  * Copyright (c) 1997
  *	Jordan Hubbard.  All rights reserved.
@@ -181,6 +181,7 @@ handle_registration(void)
     if (!msgYesNo("Do you have a working network connection and outgoing email\n"
 		  "enabled at this time?  I need to be able to reach freebsd.org\n"
 		  "in order to submit your registration.")) {
+	dialog_clear_norefresh();
 	if (!vsystem("mail %s < %s", REGISTRATION_ADDRESS, REGISTRATION_FNAME)) {
 	    msgConfirm("Thank you!  Your registration has been sent in successfully.\n");
 	    (void)unlink(REGISTRATION_FNAME);