8 files changed, 42 insertions, 372 deletions

diff --git a/release/MIRROR.SITES b/release/MIRROR.SITES
deleted file mode 100644
index 062fa81cf859..000000000000
--- a/release/MIRROR.SITES
+++ /dev/null
@@ -1,189 +0,0 @@
-$Id: MIRROR.SITES,v 1.1.2.7 1995/11/21 10:18:18 asami Exp $
-
-Obtaining FreeBSD
-   
-   The official sources for FreeBSD available via anonymous FTP from:
-
-     ftp://ftp.FreeBSD.org/pub/FreeBSD
-
-   and on CD-ROM from Walnut Creek CDROM:
-
-     Walnut Creek CDROM
-     1547 Palos Verdes Mall, Suite 260
-     Walnut Creek CA 94596 USA
-     Phone: +1 510 674-0783
-     Fax: +1 510 674-0821
-     Email: info@cdrom.com
-     WWW: http://www.cdrom.com/
-
-
-   Additionally, FreeBSD is available via anonymous FTP from the
-   following mirror sites. If you choose to obtain FreeBSD via anonymous
-   FTP, please try to use a site near you.
-
-   Australia
-
-          + ftp://ftp.physics.usyd.edu.au/FreeBSD
-            Contact: dawes@xfree86.org.
-
-          + ftp://minnie.cs.adfa.oz.au/FreeBSD
-            Contact: wkt@dolphin.cs.adfa.oz.au.
-
-   Canada
-
-          + ftp://ftp.synapse.net/contrib/FreeBSD
-            Contact: evanc@synapse.net.
-
-   Finland
-
-          + ftp://nic.funet.fi/pub/unix/FreeBSD
-            Contact: count@nic.funet.fi.
-
-   France
-
-          + ftp://ftp.ibp.fr/pub/FreeBSD
-            Contact: Remy.Card@ibp.fr.
-
-   Germany
-
-          + ftp://ftp.fb9dv.uni-duisburg.de/pub/unix/FreeBSD
-            Contact: ftp@ftp.fb9dv.uni-duisburg.de.
-
-          + ftp://gil.physik.rwth-aachen.de/pub/FreeBSD
-            Contact: kuku@gil.physik.rwth-aachen.de.
-
-          + ftp://ftp.uni-paderborn.de/freebsd
-            Contact: ftp@uni-paderborn.de.
- 
-          + ftp://ftp.leo.org/pub/comp/os/bsd/FreeBSD
-            Contact: bsd@leo.org.
-
-          + ftp://ftp.tu-dresden.de/pub/soft/unix/bsd/FreeBSD
-            Contact: pdsowner@rcs1.urz.tu-dresden.de.
-
-   Hong Kong
-
-          + ftp://ftp.hk.super.net/pub/mirror/FreeBSD
-            Contact: ftp-admin@HK.Super.NET.
-
-   Ireland
-
-          + ftp://ftp.internet-eireann.ie/pub/FreeBSD
-            Contact: ftpadmin@internet-eireann.ie.
-
-   Israel
-
-          + ftp://orgchem.weizmann.ac.il/pub/FreeBSD
-            Contact: serg@klara.weizmann.ac.il.
-
-   Japan
-
-          + ftp://ftp.tokyonet.ad.jp/pub/FreeBSD
-            Contact: ftpadmin@TokyoNet.AD.JP.
-
-          + ftp://ftp.nisiq.net/pub/os/FreeBSD/
-            Contact: ftp-admin@nisiq.net.
-
-          + ftp://ftp.iij.ad.jp/pub/FreeBSD/
-            Contact: ftp@ftp.iij.ad.jp.
-
-          + ftp://ftp.kuis.kyoto-u.ac.jp/BSD/FreeBSD/
-            Contact: ftp-admin@kuis.kyoto-u.ac.jp.
-
-          + ftp://ftp.ee.uec.ac.jp/pub/os/mirror/ftp.freebsd.org
-            Contact: ftp-admin@ftp.ee.uec.ac.jp.
-
-          + ftp://ftp.u-aizu.ac.jp/pub/os/FreeBSD
-            Contact: ftp-admin@u-aizu.ac.jp.
-
-   Korea
-
-          + ftp://ftp.cau.ac.kr/pub/FreeBSD
-            Contact: ftpadm@ftp.cau.ac.kr.
-
-          + ftp://ftp.easy.re.kr/pub/FreeBSD
-            Contact: ftpadm@easy.re.kr.
-
-   Netherlands
-
-          + ftp://ftp.nl.net/pub/os/FreeBSD
-            Contact: archive@nl.net.
-
-   Poland
-
-          + ftp://SunSITE.icm.edu.pl/pub/FreeBSD/ftp.freebsd.org
-            Contact: w.sylwestrzak@icm.edu.pl
-
-   Russia
-
-          + ftp://ftp.kiae.su/FreeBSD
-            Contact: ftp@ftp.kiae.su.
-
-   Sweden
-
-          + ftp://ftp.luth.se/pub/FreeBSD
-            Contact: ragge@ludd.luth.se.
-
-   Taiwan
-
-          + ftp://NCTUCCCA.edu.tw/Operating-Systems/FreeBSD
-            Contact: freebsd@NCTUCCCA.edu.tw.
-
-          + ftp://netbsd.csie.nctu.edu.tw/pub/FreeBSD
-            Contact: ftp@netbsd.csie.nctu.edu.tw.
-
-   Thailand
-
-          + ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD
-            Contact: ftpadmin@ftp.nectec.or.th.
-
-   UK
-
-          + ftp://src.doc.ic.ac.uk/packages/unix/FreeBSD
-            Contact: wizards@doc.ic.ac.uk.
-
-          + ftp://unix.hensa.ac.uk/mirrors/walnut.creek/FreeBSD
-            Contact: archive-admin@unix.hensa.ac.uk.
-
-          + ftp://ftp.demon.co.uk/pub/BSD/FreeBSD
-            Contact: uploads@demon.net.
-
-   USA
-
-          + ftp://ftp.neosoft.com/systems/FreeBSD
-            Contact: smace@NeoSoft.COM.
-
-          + ftp://kryten.atinc.com/pub/FreeBSD
-            Contact: jmb@kryten.atinc.com.
-
-          + ftp://ftp.cps.cmich.edu/pub/ftp.freebsd.org
-            Contact: ftpadmin@cps.cmich.edu.
-
-          + ftp://ftp.cslab.vt.edu/pub/FreeBSD
-            Contact: ftp@ftp.cslab.vt.edu.
-
-   
-   
-   The latest versions of export-restricted code for FreeBSD (2.0C or
-   later) (eBones and secure) are being made available at the following
-   locations. If you are outside the U.S. or Canada, please get secure
-   (DES) and eBones (Kerberos) from one of the following foreign
-   distribution sites:
-
-   South Africa
-
-          + ftp://ftp.internat.freebsd.org/pub/FreeBSD
-            Contact: Mark Murray mark@grondar.za.
-
-          + ftp://storm.sea.uct.ac.za/pub/FreeBSD
-            Contact: Shaun Courtney ftp@storm.sea.uct.ac.za.
-
-   Brazil
-
-          + ftp://ftp.iqm.unicamp.br/pub/FreeBSD
-            Contact: Pedro A M Vazquez vazquez@iqm.unicamp.br.
-
-   Finland
-
-          + ftp://nic.funet.fi/pub/unix/FreeBSD/eurocrypt
-            Contact: count@nic.funet.fi.
diff --git a/release/Makefile b/release/Makefile
index 53f1122545dc..19eb9ffc75e2 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.215 1996/05/16 03:20:52 jkh Exp $
+#	$Id: Makefile,v 1.217 1996/05/29 04:13:17 jkh Exp $
 #
 # How to roll a release:
 #
@@ -56,7 +56,7 @@ FD=			${RELEASEDIR}/ftp
 CD=			${RELEASEDIR}/cdrom
 
 .if !defined(WHICH_CRUNCH)
-WHICH_CRUNCH=	boot root fixit
+WHICH_CRUNCH=	boot fixit
 .endif
 
 rerelease release:
@@ -119,7 +119,7 @@ whap:
 	  sed "s/__RELEASE/${BUILDNAME}/" version.h > version.h.new && mv version.h.new version.h )
 
 clean:
-	rm -rf root_crunch boot_crunch release.[0-9] release.1[0]
+	rm -rf boot_crunch release.[0-9] release.1[0]
 
 # Clean out ${RELEASEDIR} and make the directory structure.
 release.1:
@@ -276,7 +276,6 @@ release.6:
 	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 	rm -rf ${RD}/dists
 	mkdir -p ${RD}/dists
-	mkdir -p ${RD}/info
 	@for i in ${DISTRIBUTIONS} ; \
 	do \
 		if [ -d ${RD}/trees/$${i} ] ; then \
@@ -288,8 +287,6 @@ release.6:
 	done
 	( cd ${RD}/dists && \
 		if [ -f krb/krb.aa ] ; then mv krb/* des && rmdir krb ; fi )
-	( cd ${RD}/info && \
-		if [ -d krb ] ; then mv krb/* des && rmdir krb ; fi )
 	touch release.6
 
 
@@ -318,8 +315,7 @@ release.7:
 .endif
 	( cd ${RD}/dists/src && \
 		if [ -f ssecure.aa ] ; then mv ssecure.* ../des ; fi && \
-		if [ -f sebones.aa ] ; then mv sebones.* ../des ; fi )
-	( cd ${RD}/info/src && \
+		if [ -f sebones.aa ] ; then mv sebones.* ../des ; fi && \
 		if [ -f ssecure.inf ] ; then mv ssecure.inf ../des ; fi && \
 		if [ -f sebones.inf ] ; then mv sebones.inf ../des ; fi ; )
 	@echo "src distribution is finished."
@@ -368,6 +364,8 @@ release.8: write_mfs_in_kernel
 	# add more stuff for the complete bootfd
 	tar --exclude CVS -cf - -C ${.CURDIR}/sysinstall help | \
 		tar xvf - -C ${RD}/mfsfd/stand
+	cp ${.CURDIR}/sysinstall/power.uu ${RD}/mfsfd/stand && \
+		cd ${RD}/mfsfd/stand && uudecode power.uu && rm power.uu
 	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} ${RD}/mfsfd \
 		${MFSINODE} minimum
 	mv fs-image fs-image.std
@@ -380,32 +378,9 @@ release.8: write_mfs_in_kernel
 	touch release.8
 
 #
-# --==## Create a root floppy ##==--
-#
-release.9:
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
-	rm -rf ${RD}/rootfd
-	mkdir ${RD}/rootfd
-	cd ${RD}/rootfd && \
-		mkdir stand stand/info
-	@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=root \
-		DIR=${RD}/rootfd/stand ZIP=false
-	tar --exclude CVS -cf - -C ${RD} info | tar xvf - -C ${RD}/rootfd/stand
-	tar -cf - -C ${RD}/trees/bin/dev MAKEDEV | \
-		tar xvf - -C ${RD}/rootfd/stand
-	cp ${.CURDIR}/sysinstall/power.uu ${RD}/rootfd/stand && \
-		cd ${RD}/rootfd/stand && uudecode power.uu && rm power.uu
-	cd ${RD}/rootfd && \
-		( rm -f OK && find . -print && touch OK && echo OK ) | \
-		cpio -H newc -oa | gzip -9 -c | \
-		dd conv=osync > ${RD}/floppies/root.tmp
-	mv ${RD}/floppies/root.tmp ${RD}/floppies/root.flp
-	touch release.9
-
-#
 # --==## Create a fixit floppy ##==--
 #
-release.10:
+release.9:
 	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 	rm -rf ${RD}/fixitfd
 	mkdir ${RD}/fixitfd
@@ -421,7 +396,7 @@ release.10:
 	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${FDSIZE} ${RD}/fixitfd \
 		10000 ${FDLABEL}
 	mv fs-image ${RD}/floppies/fixit.flp
-	touch release.10
+	touch release.9
 
 #
 # --==## Setup a suitable ftp-area ##==--
@@ -469,19 +444,16 @@ doTARBALL:
 		echo rolling ${TD}/$$tn tarball &&\
 		tar --exclude CVS --exclude obj -cf - ${ARG} | \
 		${ZIPNSPLIT} ${RD}/dists/${TD}/$$tn. && \
-		cd ${RD}/info && \
-		mkdir -p ${TD} && \
-		sh ${.CURDIR}/info.sh ${RD}/dists/${TD}/$$tn > ${TD}/$$tn.inf \
-	)
+		mkdir -p ${TD} && sh ${.CURDIR}/info.sh \
+		  ${RD}/dists/${TD}/$$tn > ${RD}/dists/${TD}/$$tn.inf )
 
 doRELEASE:  release.1 release.2 release.3 release.4 release.5 release.6 \
-		release.7 release.8 release.9 release.10
+		release.7 release.8 release.9
 	cd ${.CURDIR} && ${MAKE} cdrom.1 ftp.1
 	@echo "Release done"
 
 floppies:
 	cd ${.CURDIR} && ${MAKE} boot.flp
-	cd ${.CURDIR} && ${MAKE} root.flp
 	cd ${.CURDIR} && ${MAKE} fixit.flp
 	cd ${RD} && find floppies -print | cpio -dumpl ${FD}
 
@@ -489,13 +461,9 @@ boot.flp:
 	rm -f release.4 release.8
 	cd ${.CURDIR} && ${MAKE} release.4 release.8 WHICH_CRUNCH=boot
 
-root.flp:
-	rm -f release.4 release.9
-	cd ${.CURDIR} && ${MAKE} release.4 release.9 WHICH_CRUNCH=root
-
 fixit.flp:
-	rm -f release.4 release.10
-	cd ${.CURDIR} && ${MAKE} release.4 release.10 WHICH_CRUNCH=fixit
+	rm -f release.4 release.9
+	cd ${.CURDIR} && ${MAKE} release.4 release.9 WHICH_CRUNCH=fixit
 
 write_mfs_in_kernel:	${.CURDIR}/write_mfs_in_kernel.c
 	${CC} ${CFLAGS} -o write_mfs_in_kernel ${.CURDIR}/write_mfs_in_kernel.c
diff --git a/release/root_crunch.conf b/release/root_crunch.conf
deleted file mode 100644
index 71332c1d1ec4..000000000000
--- a/release/root_crunch.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: root_crunch.conf,v 1.5.2.2 1995/09/25 01:35:53 jkh Exp $
-
-# first, we list the source dirs that our programs reside in.  These are
-# searched in order listed to find the dir containing each program.
-
-srcdirs /usr/src/gnu/usr.bin
-srcdirs /usr/src/bin /usr/src/sbin /usr/src/sbin/i386 /usr/src/usr.bin
-srcdirs /usr/src/usr.sbin
-
-# second, we list all the programs we want to include in our crunched binary.
-# The order doesn't matter.  Any program that needs hard links to it gets an
-# `ln' directive.  
-
-# /bin stuff
-
-progs ls cat df ee chmod cksum cp date dd echo ed expr grep hostname kill ln
-progs mkdir mt mv rcp rm rmdir sleep stty sync test ft
-ln test [
-
-# /sbin stuff
-
-progs badsect basename chown clri disklabel dmesg dump dmesg fdisk ft 
-progs getopt init mknod mount mount_cd9660 mount_msdos mount_nfs
-progs ping reboot restore swapon umount 
-ln dump rdump
-ln restore rrestore
-ln reboot halt
-
-# /usr/bin stuff
-
-progs tar ftp rsh sed telnet rlogin 
-
-# finally, we specify the libraries to link in with our binary
-libs -lcrypt -ltelnet -lutil -ll -ledit
-libs -lgnuregex -lreadline -lncurses -lmytinfo -lkvm 
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 2b45943962af..7d904525d4f8 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.32 1996/05/23 16:34:24 jkh Exp $
+ * $Id: config.c,v 1.16.2.48 1996/05/24 06:08:18 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -432,6 +432,7 @@ configPackages(dialogMenuItem *self)
 	msgNotify("Attempting to fetch packages/INDEX file from selected media.");
 	fd = mediaDevice->get(mediaDevice, "packages/INDEX", TRUE);
 	if (fd < 0) {
+	    dialog_clear();
 	    msgConfirm("Unable to get packages/INDEX file from selected media.\n"
 		       "This may be because the packages collection is not available at\n"
 		       "on the distribution media you've chosen (most likely an FTP site\n"
@@ -439,7 +440,7 @@ configPackages(dialogMenuItem *self)
 		       "(or path to media) and try again.  If your local site does not\n"
 		       "carry the packages collection, then we recommend either a CD\n"
 		       "distribution or the master distribution on ftp.freebsd.org.");
-	    return DITEM_FAILURE;
+	    return DITEM_FAILURE | DITEM_RESTORE;
 	}
 	msgNotify("Got INDEX successfully, now building packages menu..");
 	index_init(&top, &plist);
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index cf47bab97f16..8a7cfc0e5a83 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.53 1996/05/23 16:34:25 jkh Exp $
+ * $Id: dist.c,v 1.36.2.30 1996/05/24 06:08:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -359,12 +359,13 @@ distExtract(char *parent, Distribution *me)
 	dist_attr = NULL;
 	numchunks = 0;
 
-	snprintf(buf, sizeof buf, "/stand/info/%s/%s.inf", path, dist);
-	if (file_readable(buf)) {
+	snprintf(buf, sizeof buf, "%s/%s.inf", path, dist);
+	fd = mediaDevice->get(mediaDevice, buf, TRUE);
+	if (fd >= 0) {
 	    if (isDebug())
 		msgDebug("Parsing attributes file for distribution %s\n", dist);
 	    dist_attr = safe_malloc(sizeof(Attribs) * MAX_ATTRIBS);
-	    if (DITEM_STATUS(attr_parse_file(dist_attr, buf)) == DITEM_FAILURE)
+	    if (DITEM_STATUS(attr_parse(dist_attr, fd)) == DITEM_FAILURE)
 		msgConfirm("Cannot load information file for %s distribution!\n"
 			   "Please verify that your media is valid and try again.", dist);
 	    else {
@@ -375,8 +376,13 @@ distExtract(char *parent, Distribution *me)
 		    numchunks = strtol(tmp, 0, 0);
 	    }
 	    safe_free(dist_attr);
+	    mediaDevice->close(mediaDevice, fd);
+	}
+	else if (fd == -2) {	/* Hard error, can't continue */
+	    mediaDevice->shutdown(mediaDevice);
+	    status = FALSE;
+	    goto done;
 	}
-
 	if (!numchunks)
 	    continue;
 
@@ -419,7 +425,7 @@ distExtract(char *parent, Distribution *me)
 		seconds = stop.tv_sec + (stop.tv_usec / 1000000.0);
 		if (!seconds)
 		    seconds = 1;
-		msgInfo("%d bytes read from distribution chunk %d of %d, %d KBytes/second",
+		msgInfo("%d bytes read from distribution, chunk %d of %d, %d KBytes/second",
 			total, chunk + 1, numchunks, (total / seconds) / 1024);
 		retval = write(fd2, buf, n);
 		if (retval != n) {
@@ -468,10 +474,9 @@ distExtract(char *parent, Distribution *me)
 }
 
 static void
-printSelected(char *buf, int selected, Distribution *me)
+printSelected(char *buf, int selected, Distribution *me, int *col)
 {
     int i;
-    static int col = 0;
 
     /* Loop through to see if we're in our parent's plans */
     for (i = 0; me[i].my_name; i++) {
@@ -484,15 +489,15 @@ printSelected(char *buf, int selected, Distribution *me)
 	if (!me[i].my_dir)
 	    continue;
 
-	col += strlen(me[i].my_name);
-	if (col > 50) {
-	    col = 0;
+	*col += strlen(me[i].my_name);
+	if (*col > 50) {
+	    *col = 0;
 	    strcat(buf, "\n");
 	}
 	sprintf(&buf[strlen(buf)], " %s", me[i].my_name);
 	/* Recurse if have a sub-distribution */
 	if (me[i].my_dist)
-	    printSelected(buf, *(me[i].my_mask), me[i].my_dist);
+	    printSelected(buf, *(me[i].my_mask), me[i].my_dist, col);
     }
 }
 
@@ -519,7 +524,10 @@ distExtractAll(dialogMenuItem *self)
 	distExtract(NULL, DistTable);
 
     if (Dists) {
-	printSelected(buf, Dists, DistTable);
+	int col = 0;
+
+	buf[0] = '\0';
+	printSelected(buf, Dists, DistTable, &col);
 	dialog_clear();
 	msgConfirm("Couldn't extract the following distributions.  This may\n"
 		   "be because they were not available on the installation\n"
diff --git a/release/sysinstall/help/install.hlp b/release/sysinstall/help/install.hlp
index bbb666158d98..816ab600d378 100644
--- a/release/sysinstall/help/install.hlp
+++ b/release/sysinstall/help/install.hlp
@@ -157,15 +157,6 @@ If you must install from floppy disks, either due to unsupported
 hardware or just because you enjoy doing things the hard way, you must
 first prepare some floppies for the install.
 
-The first floppy you'll need in addition to the boot.flp image is
-``floppies/root.flp'', which is somewhat special in that it's not a
-DOS filesystem floppy at all, but rather a floppy "image" (it's
-actually a gzip'd cpio file).  You can create this floppy in the same
-way that you created the boot floppy (see notes in section 2.1).  Once
-this floppy is made, you can go on to make the distribution set
-floppies using ordinary DOS or UFS (if you're preparing the floppies
-on another FreeBSD machine) formatted diskettes.
-
 You will need, at minimum, as many 1.44MB or 1.2MB floppies as it
 takes to hold all files in the bin (binary distribution) directory.
 If you're preparing these floppies under DOS, then THESE floppies
@@ -211,12 +202,9 @@ this:
 
         C> MD C:\FREEBSD
         C> XCOPY /S E:\DISTS\BIN C:\FREEBSD\BIN
-        C> XCOPY /S E:\FLOPPIES C:\FREEBSD\FLOPPIES
 
 Asssuming that `C:' was where you had free space and `E:' was where
-your CD was mounted.  Note that you need the FLOPPIES directory
-because the `root.flp' image is automatically looked for there when
-you're doing a DOS installation.
+your CD was mounted. 
 
 For as many `DISTS' as you wish to install from DOS (and you have free
 space for), install each one in a directory under `C:\FREEBSD' - the
@@ -232,11 +220,7 @@ all of the files for the distributions you're interested in, simply
 tar them onto the tape with a command like:
 
         cd /where/you/have/your/dists
-        tar cvf /dev/rwt0 (or /dev/rst0) floppies dist1 .. dist2
-
-It's important to make sure that the `floppies/' directory is
-specified along with the dists because the installation will look for
-`floppies/root.flp' on the tape.
+        tar cvf /dev/rwt0 (or /dev/rst0) dist1 .. dist2
 
 When you go to do the installation, you should also make sure that you
 leave enough room in some temporary directory (which you'll be allowed
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 13ce6b561101..1810cf1cbab8 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/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.97 1996/05/16 11:47:30 jkh Exp $
+ * $Id: install.c,v 1.71.2.90 1996/05/24 06:08:41 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -455,7 +455,7 @@ installNovice(dialogMenuItem *self)
 	    configPorts(self);
     }
 
-    if (!msgYesNo("The FreeBSD package collection is a collection of over 300 ready-to-run\n"
+    if (!msgYesNo("The FreeBSD package collection is a collection of over 450 ready-to-run\n"
 		  "applications, from text editors to games to WEB servers.  Would you like\n"
 		  "to browse the collection now?"))
 	configPackages(self);
@@ -522,11 +522,6 @@ installCommit(dialogMenuItem *self)
 	    return i;
 	if (DITEM_STATUS((i = configFstab())) == DITEM_FAILURE)
 	    return i;
-	if (!rootExtract()) {
-	    msgConfirm("Failed to load the ROOT distribution.  Please correct\n"
-		       "this problem and try again.");
-	    return DITEM_FAILURE;
-	}
     }
 
     i = distExtractAll(self);
@@ -827,67 +822,6 @@ copySelf(void)
     return TRUE;
 }
 
-static Boolean loop_on_root_floppy(void);
-
-Boolean
-rootExtract(void)
-{
-    int fd;
-    static Boolean alreadyExtracted = FALSE;
-
-    if (alreadyExtracted)
-	return TRUE;
-
-    if (mediaDevice) {
-	if (isDebug())
-	    msgDebug("Attempting to extract root image from %s\n", mediaDevice->name);
-	switch(mediaDevice->type) {
-
-	case DEVICE_TYPE_FLOPPY:
-	    alreadyExtracted = loop_on_root_floppy();
-	    break;
-
-	default:
-	    if (!mediaDevice->init(mediaDevice))
-		break;
-	    fd = mediaDevice->get(mediaDevice, "floppies/root.flp", FALSE);
-	    if (fd < 0) {
-		msgConfirm("Couldn't get root image from %s!\n"
-			   "Will try to get it from floppy.", mediaDevice->name);
-		mediaDevice->shutdown(mediaDevice);
-	        alreadyExtracted = loop_on_root_floppy();
-	    }
-	    else {
-		msgNotify("Loading root image from:\n%s", mediaDevice->name);
-		alreadyExtracted = mediaExtractDist("/", fd);
-		mediaDevice->close(mediaDevice, fd);
-	    }
-	    break;
-	}
-    }
-    else
-	alreadyExtracted = loop_on_root_floppy();
-    return alreadyExtracted;
-}
-
-static Boolean
-loop_on_root_floppy(void)
-{
-    int fd;
-    int status = FALSE;
-
-    while (1) {
-	fd = getRootFloppy();
-	if (fd != -1) {
-	    msgNotify("Extracting root floppy..");
-	    status = mediaExtractDist("/", fd);
-	    close(fd);
-	    break;
-	}
-    }
-    return status;
-}
-
 static void
 create_termcap(void)
 {
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index bb2bc60533ff..5ab515a04e33 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.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.56 1996/05/16 11:47:44 jkh Exp $
+ * $Id: sysinstall.h,v 1.42.2.52 1996/05/24 06:09:02 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -456,7 +456,6 @@ extern int	installUpgrade(dialogMenuItem *self);
 extern int	installFilesystems(dialogMenuItem *self);
 extern int	installVarDefaults(dialogMenuItem *self);
 extern Boolean	copySelf(void);
-extern Boolean	rootExtract(void);
 
 /* installFinal.c */
 extern int	configGated(dialogMenuItem *self);