Major surgery.

1. Use new dialog menu hacks (no strings, just arrays of dialogMenuItem structs)
   so that I can create composite menus with radio/checkbox/... items in them,
   removing some long-standing UI bogons in various menus.  This work isn't
   finished yet, but will be done in two phases.  This is phase one.

2. Remove all the script installation stuff.  I never got time to document it,
   it was arcane and it just complicated much of the code.  There are better
   ways of doing this if I want to do auto-driven installations later.

3. Remove much dead code and otherwise attempt to remove as much historical
   grot as possible so that this code is easier to hack on.  This is also
   a two-stage process, phase one of which is now complete.

1 files changed, 6 insertions, 5 deletions

diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 06fa72329c64..685e8b42a344 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -12,11 +12,12 @@
 #define DIST_INFO		0x0080
 #define DIST_COMPAT1X		0x0100
 #define DIST_COMPAT20		0x0200
-#define DIST_XF86		0x0400
-#define DIST_COMMERCIAL		0x0800
-#define DIST_DES		0x1000
-#define DIST_EXPERIMENTAL	0x2000
-#define DIST_ALL		0x0FFF
+#define DIST_COMPAT21		0x0400
+#define DIST_XF86		0x0800
+#define DIST_COMMERCIAL		0x1000
+#define DIST_DES		0x2000
+#define DIST_EXPERIMENTAL	0x4000
+#define DIST_ALL		0x0FFF	/* Don't include commerce, DES or experimental in "all" */
 
 /* Canned distribution sets */
 #define _DIST_DEVELOPER \