Fix a bug in the /etc populating copy.

Change root.flp from a new format CPIO archive to a tar archive.
Unless we're willing to change the main tarballs from tar format to
"newc" (or, even better, "crc") cpio format, we need to use one common
one for all and that's tar for now.  Install will now grab "root floppy"
from an ftp site if that's what you've got set.

Fix even more gripes from Poul's list.

P.S.  As soon as I get the distfiles copied over to freefall tomorrow
morning, those of you wishing to test minimal installs over ftp should
be able to do so by grabbing the boot floppy and nothing else.  Keep
your eyes open for my announcement.

6 files changed, 122 insertions, 81 deletions

diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 5ab382f..2c07286 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.20 1995/05/25 18:48:24 jkh Exp $
+ * $Id: dist.c,v 1.21 1995/05/26 08:41:39 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -177,44 +177,44 @@ static Distribution SrcDistTable[] = {
 
 /* The XFree86 distribution */
 static Distribution XF86DistTable[] = {
-{ "bin",	"/usr",			&XF86Dists,	DIST_XF86_BIN,		NULL		},
-{ "lib",	"/usr",			&XF86Dists,	DIST_XF86_LIB,		NULL		},
-{ "doc",	"/usr",			&XF86Dists,	DIST_XF86_DOC,		NULL		},
+{ "x311bin",	"/usr",			&XF86Dists,	DIST_XF86_BIN,		NULL		},
+{ "x311lib",	"/usr",			&XF86Dists,	DIST_XF86_LIB,		NULL		},
+{ "x311doc",	"/usr",			&XF86Dists,	DIST_XF86_DOC,		NULL		},
 { "xf86311/",	"/usr",			&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
-{ "man",	"/usr",			&XF86Dists,	DIST_XF86_MAN,		NULL		},
-{ "prog",	"/usr",			&XF86Dists,	DIST_XF86_PROG,		NULL		},
-{ "link",	"/usr",			&XF86Dists,	DIST_XF86_LINK,		NULL		},
-{ "pex",	"/usr",			&XF86Dists,	DIST_XF86_PEX,		NULL		},
-{ "lbx",	"/usr",			&XF86Dists,	DIST_XF86_LBX,		NULL		},
-{ "xicf",	"/usr",			&XF86Dists,	DIST_XF86_XINIT,	NULL		},
-{ "xdmcf",	"/usr",			&XF86Dists,	DIST_XF86_XDMCF,	NULL		},
+{ "x311man",	"/usr",			&XF86Dists,	DIST_XF86_MAN,		NULL		},
+{ "x311prog",	"/usr",			&XF86Dists,	DIST_XF86_PROG,		NULL		},
+{ "x311link",	"/usr",			&XF86Dists,	DIST_XF86_LINK,		NULL		},
+{ "x311pex",	"/usr",			&XF86Dists,	DIST_XF86_PEX,		NULL		},
+{ "x311lbx",	"/usr",			&XF86Dists,	DIST_XF86_LBX,		NULL		},
+{ "x311xicf",	"/usr",			&XF86Dists,	DIST_XF86_XINIT,	NULL		},
+{ "x311xdmcf",	"/usr",			&XF86Dists,	DIST_XF86_XDMCF,	NULL		},
 { "xf86311/",	"/usr",			&XF86Dists,	DIST_XF86_SERVER,	XF86ServerDistTable },
 { NULL },
 };
 
 /* The XFree86 server distribution */
 static Distribution XF86ServerDistTable[] = {
-{ "X3118514",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_8514,	NULL		},
-{ "X311AGX",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_AGX,	NULL		},
-{ "X311Mch3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH32,NULL		},
-{ "X311Mch8",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH8,	NULL		},
-{ "X311Mono",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MONO,	NULL		},
-{ "X311P9K",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_P9000,	NULL		},
-{ "X311S3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_S3,	NULL		},
-{ "X311SVGA",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_SVGA,	NULL		},
-{ "X311VG16",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_VGA16,	NULL		},
-{ "X311W32",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_W32,	NULL		},
-{ "X311nest",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_NEST,	NULL		},
+{ "x3118514",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_8514,	NULL		},
+{ "x311AGX",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_AGX,	NULL		},
+{ "x311Mch3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH32,NULL		},
+{ "x311Mch8",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH8,	NULL		},
+{ "x311Mono",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MONO,	NULL		},
+{ "x311P9K",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_P9000,	NULL		},
+{ "x311S3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_S3,	NULL		},
+{ "x311SVGA",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_SVGA,	NULL		},
+{ "x311VG16",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_VGA16,	NULL		},
+{ "x311W32",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_W32,	NULL		},
+{ "x311nest",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_NEST,	NULL		},
 { NULL },
 };
 
 /* The XFree86 font distribution */
 static Distribution XF86FontDistTable[] = {
-{ "X311fnts",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_MISC,	NULL		},
-{ "X311f100",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_100,	NULL		},
-{ "X311fscl",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SCALE,	NULL		},
-{ "X311fnon",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_NON,	NULL		},
-{ "X311fsrv",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SERVER,	NULL		},
+{ "x311fnts",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_MISC,	NULL		},
+{ "x311f100",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_100,	NULL		},
+{ "x311fscl",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SCALE,	NULL		},
+{ "x311fnon",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_NON,	NULL		},
+{ "x311fsrv",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SERVER,	NULL		},
 { NULL },
 };
 
@@ -235,9 +235,8 @@ distExtract(char *parent, Distribution *me)
 	    else {
 		char dparent[FILENAME_MAX];
 
-		if (parent)	/* Yetch */
-		    snprintf(dparent, FILENAME_MAX, "%s/", parent);
-		fd = (*mediaDevice->get)(parent ? dparent : me[i].my_name, me[i].my_name);
+		snprintf(dparent, FILENAME_MAX, "%s/", parent ? parent : me[i].my_name);
+		fd = (*mediaDevice->get)(dparent, me[i].my_name);
 		if (fd != -1) {
 		    status = mediaExtractDist(me[i].my_name, me[i].my_dir, fd);
 		    if (mediaDevice->close)
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 9f68b23..d09cbee 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.56 1995/05/26 08:41:40 jkh Exp $
+ * $Id: install.c,v 1.57 1995/05/26 08:58:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -211,7 +211,7 @@ installInitial(void)
 	exit(1);
     }
     root_extract();
-    vsystem("(cd /stand; find etc) | cpio -pdmv /");
+    vsystem("(cd /stand; find etc | cpio -o) | (cd /; cpio -idmv)");
     alreadyDone = TRUE;
     return TRUE;
 }
@@ -397,7 +397,7 @@ root_extract(void)
 		    break;
 	    fd = (*mediaDevice->get)("root.flp", "floppies/");
 	    if (fd != -1) {
-		msgNotify("Loading root floppy over %s", mediaDevice->name);
+		msgNotify("Loading root floppy from %s", mediaDevice->name);
 		status = mediaExtractDist("root.flp", "/", fd);
 		if (mediaDevice->close)
 		    (*mediaDevice->close)(mediaDevice, fd);
@@ -421,6 +421,7 @@ loop_on_root_floppy(void)
 {
     int fd;
 
+    mediaDevice = NULL;
     fd = genericGetDist("root.flp", NULL, TRUE);
     if (fd == -1)
 	return;
diff --git a/release/sysinstall/media_strategy.c b/release/sysinstall/media_strategy.c
index 4462ab4..804e195 100644
--- a/release/sysinstall/media_strategy.c
+++ b/release/sysinstall/media_strategy.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: media_strategy.c,v 1.22 1995/05/25 18:48:27 jkh Exp $
+ * $Id: media_strategy.c,v 1.23 1995/05/26 08:41:43 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -228,8 +228,10 @@ genericGetDist(char *path, void *attrs, Boolean prompt)
     Device *devp;
     struct attribs *dist_attrib = (struct attribs *)attrs;
 
+  top:
+    fd = -1;
     /* Floppy is always last-ditch device */
-    while (prompt && floppyDev == NULL) {
+    while (!mediaDevice && (prompt && floppyDev == NULL)) {
 	Device **devs;
 	int cnt;
 		    
@@ -251,9 +253,11 @@ genericGetDist(char *path, void *attrs, Boolean prompt)
 	if (!floppyDev)
 	    continue;
 	fd = open(floppyDev->devname, O_RDONLY);
-	return fd;
+	if (fd != -1)
+	    return fd;
+	else
+	    floppyDev = NULL;
     }
-    
     if (stat(path, &sb) == 0)
     {
 	fd = open(path, O_RDONLY, 0);
@@ -268,12 +272,23 @@ genericGetDist(char *path, void *attrs, Boolean prompt)
     }
 
     snprintf(buf, 512, "%s.aa", path);
-    if (stat(buf, &sb) != 0)
+    if (stat(buf, &sb) != 0 && !prompt)
     {
 	msgConfirm("Cannot find file(s) for distribution in ``%s''!\n", path);
 	return -1;
     }
 
+    if (fd == -1 && prompt) {
+	if (mediaDevice->shutdown)
+	    (*mediaDevice->shutdown)(mediaDevice);
+
+	if (mediaDevice->init)
+	    if (!(*mediaDevice->init)(mediaDevice))
+		return -1;
+	msgConfirm("Please put distribution files for %s\nin %s and press return", path, mediaDevice->description);
+	goto top;
+    }
+
     if (dist_attrib) {
 	tmp = attr_match(dist_attrib, "pieces");
 	numchunks = atoi(tmp);
@@ -438,6 +453,7 @@ mediaGetCDROM(char *dist, char *path)
 void
 mediaShutdownCDROM(Device *dev)
 {
+    
     msgDebug("In mediaShutdownCDROM\n");
     if (getDistpid) {
 	int i, j;
@@ -456,12 +472,30 @@ mediaShutdownCDROM(Device *dev)
     return;
 }
 
+static Boolean floppyMounted;
+
 Boolean
 mediaInitFloppy(Device *dev)
 {
-    if (Mkdir("/mnt", NULL))
-	return FALSE;
+    struct ufs_args ufsargs;
+    char mountpoint[FILENAME_MAX];
 
+    if (floppyMounted)
+	return TRUE;
+    memset(&ufsargs,0,sizeof ufsargs);
+
+    if (Mkdir("/mnt", NULL)) {
+	msgConfirm("Unable to make directory mountpoint for %s!", mountpoint);
+	return FALSE;
+    }
+    msgDebug("initFloppy:  mount floppy %s on /mnt\n", dev->devname); 
+    ufsargs.fspec = dev->devname;
+    if (mount(MOUNT_MSDOS, "/mnt", 0, (caddr_t)&ufsargs) == -1) {
+	msgConfirm("Error mounting floppy %s (%s) on /mnt : %s\n", dev->name,
+		   dev->devname, mountpoint, strerror(errno));
+	return FALSE;
+    }
+    floppyMounted = TRUE;
     return TRUE;
 }
 
@@ -493,7 +527,12 @@ mediaGetFloppy(char *dist, char *path)
 void
 mediaShutdownFloppy(Device *dev)
 {
-    return;
+    if (floppyMounted) {
+	if (vsystem("umount /mnt") != 0)
+	    msgDebug("Umount of floppy on /mnt failed: %s (%d)\n", strerror(errno), errno);
+	else
+	    floppyMounted = FALSE;
+    }
 }
 
 Boolean
@@ -616,8 +655,10 @@ mediaInitFTP(Device *dev)
 	return FALSE;
     if (!strcmp(url, "other")) {
 	url = msgGetInput("ftp://", "Please specify the URL of a FreeBSD distribution on a\nremote ftp site.  This site must accept anonymous ftp!\nA URL looks like this:  ftp://<hostname>/<path>");
-	if (!url)
+	if (!url || strncmp("ftp://", url, 6))
 	    return FALSE;
+	else
+	    variable_set2("ftp", url);
     }
 
     my_name = getenv(VAR_HOSTNAME);
@@ -630,10 +671,9 @@ mediaInitFTP(Device *dev)
     hostname = url + 6;
     if ((dir = index(hostname, '/')) != NULL)
 	*(dir++) = '\0';
-    else
-	dir = "/";
+    strcpy(dev->name, hostname);
     msgDebug("hostname = `%s'\n", hostname);
-    msgDebug("dir = `%s'\n", dir);
+    msgDebug("dir = `%s'\n", dir ? dir : "/");
     msgNotify("Looking up host %s..", hostname);
     if ((gethostbyname(hostname) == NULL) && (inet_addr(hostname) == INADDR_NONE)) {
 	msgConfirm("Cannot resolve hostname `%s'!  Are you sure your name server\nand/or gateway values are set properly?", hostname);
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 9f68b23..d09cbee 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/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.56 1995/05/26 08:41:40 jkh Exp $
+ * $Id: install.c,v 1.57 1995/05/26 08:58:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -211,7 +211,7 @@ installInitial(void)
 	exit(1);
     }
     root_extract();
-    vsystem("(cd /stand; find etc) | cpio -pdmv /");
+    vsystem("(cd /stand; find etc | cpio -o) | (cd /; cpio -idmv)");
     alreadyDone = TRUE;
     return TRUE;
 }
@@ -397,7 +397,7 @@ root_extract(void)
 		    break;
 	    fd = (*mediaDevice->get)("root.flp", "floppies/");
 	    if (fd != -1) {
-		msgNotify("Loading root floppy over %s", mediaDevice->name);
+		msgNotify("Loading root floppy from %s", mediaDevice->name);
 		status = mediaExtractDist("root.flp", "/", fd);
 		if (mediaDevice->close)
 		    (*mediaDevice->close)(mediaDevice, fd);
@@ -421,6 +421,7 @@ loop_on_root_floppy(void)
 {
     int fd;
 
+    mediaDevice = NULL;
     fd = genericGetDist("root.flp", NULL, TRUE);
     if (fd == -1)
 	return;
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 5ab382f..2c07286 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/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.20 1995/05/25 18:48:24 jkh Exp $
+ * $Id: dist.c,v 1.21 1995/05/26 08:41:39 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -177,44 +177,44 @@ static Distribution SrcDistTable[] = {
 
 /* The XFree86 distribution */
 static Distribution XF86DistTable[] = {
-{ "bin",	"/usr",			&XF86Dists,	DIST_XF86_BIN,		NULL		},
-{ "lib",	"/usr",			&XF86Dists,	DIST_XF86_LIB,		NULL		},
-{ "doc",	"/usr",			&XF86Dists,	DIST_XF86_DOC,		NULL		},
+{ "x311bin",	"/usr",			&XF86Dists,	DIST_XF86_BIN,		NULL		},
+{ "x311lib",	"/usr",			&XF86Dists,	DIST_XF86_LIB,		NULL		},
+{ "x311doc",	"/usr",			&XF86Dists,	DIST_XF86_DOC,		NULL		},
 { "xf86311/",	"/usr",			&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
-{ "man",	"/usr",			&XF86Dists,	DIST_XF86_MAN,		NULL		},
-{ "prog",	"/usr",			&XF86Dists,	DIST_XF86_PROG,		NULL		},
-{ "link",	"/usr",			&XF86Dists,	DIST_XF86_LINK,		NULL		},
-{ "pex",	"/usr",			&XF86Dists,	DIST_XF86_PEX,		NULL		},
-{ "lbx",	"/usr",			&XF86Dists,	DIST_XF86_LBX,		NULL		},
-{ "xicf",	"/usr",			&XF86Dists,	DIST_XF86_XINIT,	NULL		},
-{ "xdmcf",	"/usr",			&XF86Dists,	DIST_XF86_XDMCF,	NULL		},
+{ "x311man",	"/usr",			&XF86Dists,	DIST_XF86_MAN,		NULL		},
+{ "x311prog",	"/usr",			&XF86Dists,	DIST_XF86_PROG,		NULL		},
+{ "x311link",	"/usr",			&XF86Dists,	DIST_XF86_LINK,		NULL		},
+{ "x311pex",	"/usr",			&XF86Dists,	DIST_XF86_PEX,		NULL		},
+{ "x311lbx",	"/usr",			&XF86Dists,	DIST_XF86_LBX,		NULL		},
+{ "x311xicf",	"/usr",			&XF86Dists,	DIST_XF86_XINIT,	NULL		},
+{ "x311xdmcf",	"/usr",			&XF86Dists,	DIST_XF86_XDMCF,	NULL		},
 { "xf86311/",	"/usr",			&XF86Dists,	DIST_XF86_SERVER,	XF86ServerDistTable },
 { NULL },
 };
 
 /* The XFree86 server distribution */
 static Distribution XF86ServerDistTable[] = {
-{ "X3118514",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_8514,	NULL		},
-{ "X311AGX",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_AGX,	NULL		},
-{ "X311Mch3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH32,NULL		},
-{ "X311Mch8",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH8,	NULL		},
-{ "X311Mono",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MONO,	NULL		},
-{ "X311P9K",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_P9000,	NULL		},
-{ "X311S3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_S3,	NULL		},
-{ "X311SVGA",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_SVGA,	NULL		},
-{ "X311VG16",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_VGA16,	NULL		},
-{ "X311W32",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_W32,	NULL		},
-{ "X311nest",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_NEST,	NULL		},
+{ "x3118514",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_8514,	NULL		},
+{ "x311AGX",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_AGX,	NULL		},
+{ "x311Mch3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH32,NULL		},
+{ "x311Mch8",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH8,	NULL		},
+{ "x311Mono",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MONO,	NULL		},
+{ "x311P9K",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_P9000,	NULL		},
+{ "x311S3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_S3,	NULL		},
+{ "x311SVGA",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_SVGA,	NULL		},
+{ "x311VG16",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_VGA16,	NULL		},
+{ "x311W32",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_W32,	NULL		},
+{ "x311nest",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_NEST,	NULL		},
 { NULL },
 };
 
 /* The XFree86 font distribution */
 static Distribution XF86FontDistTable[] = {
-{ "X311fnts",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_MISC,	NULL		},
-{ "X311f100",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_100,	NULL		},
-{ "X311fscl",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SCALE,	NULL		},
-{ "X311fnon",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_NON,	NULL		},
-{ "X311fsrv",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SERVER,	NULL		},
+{ "x311fnts",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_MISC,	NULL		},
+{ "x311f100",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_100,	NULL		},
+{ "x311fscl",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SCALE,	NULL		},
+{ "x311fnon",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_NON,	NULL		},
+{ "x311fsrv",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SERVER,	NULL		},
 { NULL },
 };
 
@@ -235,9 +235,8 @@ distExtract(char *parent, Distribution *me)
 	    else {
 		char dparent[FILENAME_MAX];
 
-		if (parent)	/* Yetch */
-		    snprintf(dparent, FILENAME_MAX, "%s/", parent);
-		fd = (*mediaDevice->get)(parent ? dparent : me[i].my_name, me[i].my_name);
+		snprintf(dparent, FILENAME_MAX, "%s/", parent ? parent : me[i].my_name);
+		fd = (*mediaDevice->get)(dparent, me[i].my_name);
 		if (fd != -1) {
 		    status = mediaExtractDist(me[i].my_name, me[i].my_dir, fd);
 		    if (mediaDevice->close)
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 9f68b23..d09cbee 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/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.56 1995/05/26 08:41:40 jkh Exp $
+ * $Id: install.c,v 1.57 1995/05/26 08:58:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -211,7 +211,7 @@ installInitial(void)
 	exit(1);
     }
     root_extract();
-    vsystem("(cd /stand; find etc) | cpio -pdmv /");
+    vsystem("(cd /stand; find etc | cpio -o) | (cd /; cpio -idmv)");
     alreadyDone = TRUE;
     return TRUE;
 }
@@ -397,7 +397,7 @@ root_extract(void)
 		    break;
 	    fd = (*mediaDevice->get)("root.flp", "floppies/");
 	    if (fd != -1) {
-		msgNotify("Loading root floppy over %s", mediaDevice->name);
+		msgNotify("Loading root floppy from %s", mediaDevice->name);
 		status = mediaExtractDist("root.flp", "/", fd);
 		if (mediaDevice->close)
 		    (*mediaDevice->close)(mediaDevice, fd);
@@ -421,6 +421,7 @@ loop_on_root_floppy(void)
 {
     int fd;
 
+    mediaDevice = NULL;
     fd = genericGetDist("root.flp", NULL, TRUE);
     if (fd == -1)
 	return;