Smash this into conformance again. I'm just trying to test a 2.1-snap

build right now and need this to work.  Talking with Peter now about
a better solution to my merging problems.

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.50 1996/05/01 08:50:00 jkh Exp $
+ * $Id: dist.c,v 1.52 1996/05/16 13:39:06 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -183,7 +183,7 @@ int
 distSetXDeveloper(dialogMenuItem *self)
 {
     distReset(NULL);
-    Dists = _DIST_DEVELOPER | DIST_XF86;
+    Dists = _DIST_DEVELOPER;
     SrcDists = DIST_SRC_ALL;
     XF86Dists = DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
     XF86ServerDists = DIST_XF86_SERVER_SVGA;
@@ -283,7 +283,7 @@ distSetXF86(dialogMenuItem *self)
 	if (XF86FontDists)
 	    XF86Dists |= DIST_XF86_FONTS;
 	if (XF86Dists)
-	    Dists |= (DIST_XF86 | DIST_COMPAT21);	/* XXX for now we need compat21 for X to work XXX */
+	    Dists |= DIST_XF86;
 	msgDebug("SetXF86 Masks: Server: %0x, Fonts: %0x, XDists: %0x, Dists: %0x\n",
 		 XF86ServerDists, XF86FontDists, XF86Dists, Dists);
     }

release/sysinstall/help/install.hlp

@@ -180,12 +180,14 @@ which is why I'm taking such special care to mention it here!
 If you're creating the floppies from another FreeBSD machine, a format
 is still not a bad idea though you don't need to put a DOS filesystem
 on each floppy.  You can use the `disklabel' and `newfs' commands to
-put a UFS filesystem on them instead, like so:
+put a UFS filesystem on a floppy, as the following sequence of commands
+(for a 3.5" 1.44MB floppy disk) illustrates:
 
-        disklabel -w -r fd0 floppy3     (use floppy5 for 1.2MB disks)
-        newfs /dev/rfd0
+        fdformat -f 1440 fd0.1440
+        disklabel -w -r fd0.1440 floppy3
+        newfs -t 2 -u 18 -l 1 -i 65536 /dev/rfd0
 
-Then you can mount and write to them like any other file system.
+(Use "fd0.1200" and "floppy5" for 5.25" 1.2MB disks).
 
 After you've formatted the floppies for DOS or UFS, you'll need to
 copy the files onto them.  The distribution files are split into

release/sysinstall/menus.c

@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.61 1996/05/16 11:47:38 jkh Exp $
+ * $Id: menus.c,v 1.63 1996/05/16 13:39:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.