Remove the now-unusable ports configuration code. Swapping CDs is bogus.

1 files changed, 1 insertions, 106 deletions

diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 277f1a1..9489c89 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.49 1996/10/02 10:44:24 jkh Exp $
+ * $Id: config.c,v 1.50 1996/10/03 07:50:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -48,8 +48,6 @@
 static Chunk *chunk_list[MAX_CHUNKS];
 static int nchunks;
 
-extern int cdromMounted;
-
 /* arg to sort */
 static int
 chunk_compare(Chunk *c1, Chunk *c2)
@@ -512,109 +510,6 @@ configPackages(dialogMenuItem *self)
     return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
 }
 
-int
-configPorts(dialogMenuItem *self)
-{
-    char *cp, *dist = NULL; /* Shut up compiler */
-    int status = DITEM_SUCCESS, tries = 0;
-
-    if (!variable_get(VAR_PORTS_PATH))
-	variable_set2(VAR_PORTS_PATH, dist = "/cdrom/ports");
-    while (!directory_exists(dist)) {
-	if (++tries > 2) {
-	    dialog_clear_norefresh();
-	    msgConfirm("You appear to be having some problems with your CD drive\n"
-		       "or perhaps cannot find the second CD.  This step will now\n"
-		       "therefore be skipped.");
-	    status = DITEM_FAILURE;
-	    goto fixup;
-	}
-
-	/* Even if we're running multi-user, unmount it for this case */
-	cdromMounted = CD_WE_MOUNTED_IT;
-	mediaDevice->shutdown(mediaDevice);
-
-	dialog_clear_norefresh();
-	msgConfirm("The ports collection is now on the second CDROM due to\n"
-		   "space constraints.  Please remove the first CD from the\n"
-		   "drive at this time and insert the second CDROM.  You will\n"
-		   "also need to have the second CDROM in your drive any time\n"
-		   "you wish to use the ports collection.  When you're ready,\n"
-		   "please press [ENTER].");
-	if (!mediaDevice->init(mediaDevice)) {
-	    dialog_clear_norefresh();
-	    msgConfirm("Mount failed - either the CDROM isn't in the drive or\n"
-		       "you did not allow sufficient time for the drive to become\n"
-		       "ready before pressing [ENTER].  Please try again.");
-	}
-    }
-
-    dialog_clear_norefresh();
-    cp = msgGetInput("/usr/ports",
-		     "Where would you like to create the link tree?\n"
-		     "(press [ENTER] for default location).  The link tree should\n"
-		     "reside in a directory with as much free space as possible,\n"
-		     "as you'll need space to compile any ports.");
-    if (!cp || !*cp) {
-	status = DITEM_FAILURE;
-	goto fixup;
-    }
-    if (Mkdir(cp)) {
-	status = DITEM_FAILURE;
-	goto fixup;
-    }
-    if (strcmp(cp, "/usr/ports")) {
-	unlink("/usr/ports");
-	if (symlink(cp, "/usr/ports") == -1) {
-	    dialog_clear_norefresh();
-	    msgConfirm("Unable to create a symlink from /usr/ports to %s!\n"
-		       "I can't continue, sorry!", cp);
-	    status = DITEM_FAILURE;
-	    goto fixup;
-	}
-	else {
-	    dialog_clear_norefresh();
-	    msgConfirm("NOTE: This directory is also now symlinked to /usr/ports\n"
-		       "which, for a variety of reasons, is the directory the ports\n"
-		       "framework expects to find its files in.  You should refer to\n"
-		       "/usr/ports instead of %s directly when you're working in the\n"
-		       "ports collection.", cp);
-	}
-    }
-    dialog_clear_norefresh();
-    msgNotify("Making a link tree from %s to %s.", dist, cp);
-    if (DITEM_STATUS(lndir(dist, cp)) != DITEM_SUCCESS) {
-	dialog_clear_norefresh();
-	msgConfirm("The lndir function returned an error status and may not have.\n"
-		   "successfully generated the link tree.  You may wish to inspect\n"
-		   "the /usr/ports directory carefully for any missing link files.");
-    }
-    else {
-	dialog_clear_norefresh();
-	msgConfirm("The /usr/ports directory is now ready to use.  When the system comes\n"
-		   "up fully, you can cd to this directory and type `make' in any sub-\n"
-		   "directory for which you'd like to compile a port.  You can also\n"
-		   "cd to /usr/ports and type `make print-index' for a complete list of all\n"
-		   "ports in the hierarchy.");
-    }
-fixup:
-    tries = 0;
-    while (++tries < 3) {
-	mediaDevice->shutdown(mediaDevice);
-	dialog_clear_norefresh();
-	msgConfirm("Done with the second CD.  Please remove it and reinsert the first\n"
-		   "CDROM now.  It may be required for subsequence installation steps.\n\n"
-		   "When you've done so, please press [ENTER].");
-	if (!mediaDevice->init(mediaDevice)) {
-	    dialog_clear_norefresh();
-	    msgConfirm("Mount failed - either the CDROM isn't in the drive or\n"
-		       "you did not allow sufficient time for the drive to become\n"
-		       "ready before pressing [ENTER].  Please try again.");
-	}
-    }
-    return status | DITEM_RESTORE;
-}
-
 /* Load gated package */
 int
 configGated(dialogMenuItem *self)