Index: defs.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/defs.h,v
retrieving revision 1.75
diff -u -r1.75 defs.h
--- defs.h	2003/01/12 21:49:50	1.75
+++ defs.h	2003/04/04 15:31:06
@@ -88,7 +88,6 @@
 typedef struct distinfo {
 	char *name;
 	int   getit;
-	char *fdlast;
 	char *desc;
 } distinfo;
 
Index: menus.mi.en
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/menus.mi.en,v
retrieving revision 1.63
diff -u -r1.63 menus.mi.en
--- menus.mi.en	2003/01/22 05:59:07	1.63
+++ menus.mi.en	2003/04/04 15:31:10
@@ -329,10 +329,12 @@
 
 menu fdremount, title "What do you want to do?";
 	option "Try again", exit, action { yesno = 1; };
+	option "Set finished", exit, action { yesno = 2; };
 	option "Abort install", exit, action { yesno = 0; };
 
 menu fdok, title "Hit enter to continue";
 	option "OK", exit, action { yesno = 1; };
+	option "Set finished", exit, action { yesno = 2; };
 	option "Abort install", exit, action { yesno = 0; };
 
 menu crypttype, title "Password cipher", y=16;
Index: msg.mi.en
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/msg.mi.en,v
retrieving revision 1.95
diff -u -r1.95 msg.mi.en
--- msg.mi.en	2003/01/22 05:59:07	1.95
+++ msg.mi.en	2003/04/04 15:31:17
@@ -720,12 +720,18 @@
 
 message fdnotfound
 {Could not find the file named "%s" on the disk.  Please load the
-floppy with that file on it.}
+floppy with that file on it.
 
+If this was the last set's disk, hit "Set finished" to continue on
+the next set, if any.}
+
 message fdremount
 {The floppy was not mounted successfully.  You may:
 
 Try again and put in the floppy containing the file named "%s".
+
+Not load any more files from the set and continue on the next set,
+if any.
 
 Not load any more files from floppy and abort the process.
 }
Index: util.c
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/util.c,v
retrieving revision 1.88
diff -u -r1.88 util.c
--- util.c	2003/02/22 03:20:48	1.88
+++ util.c	2003/04/04 15:31:17
@@ -197,7 +197,7 @@
 	while (list->name) {
 		strcpy(post, ".aa");
 		snprintf(distname, STRSIZE, "%s%s", list->name, dist_postfix);
-		while (list->getit && strcmp(&post[1],list->fdlast) <= 0) {
+		while (list->getit) {
 			snprintf(fname, STRSIZE, "%s%s", list->name, post);
 			snprintf(full_name, STRSIZE, "/mnt2/%s", fname);
 			first = 1;
@@ -211,6 +211,8 @@
 				process_menu(MENU_fdok);
 				if (!yesno)
 					return 0;
+				else if (yesno == 2)
+					return 1;
 				while (run_prog(0, NULL, 
 				    "/sbin/mount -r -t %s %s /mnt2",
 				    fdtype, fddev)) {
@@ -218,6 +220,8 @@
 					process_menu(MENU_fdremount);
 					if (!yesno)
 						return 0;
+					else if (yesno == 2)
+						return 1;
 				}
 				mounted = 1;
 				first = 0;
Index: arch/acorn26/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/acorn26/md.h,v
retrieving revision 1.1
diff -u -r1.1 md.h
--- arch/acorn26/md.h	2002/05/02 23:02:51	1.1
+++ arch/acorn26/md.h	2003/04/04 15:31:17
@@ -59,23 +59,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	0, NULL, "Kernel       : "},
-    {"kern-FOURMEG",	0, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	0, "Kernel       : "},
+    {"kern-FOURMEG",	0, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
-    {"xserver",		1, NULL, "X11 servers  : "},
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/acorn32/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/acorn32/md.h,v
retrieving revision 1.4
diff -u -r1.4 md.h
--- arch/acorn32/md.h	2002/04/02 17:11:20	1.4
+++ arch/acorn32/md.h	2003/04/04 15:31:17
@@ -59,25 +59,25 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	0, NULL, "Kernel       : "},
-    {"kern-RPC_WSCONS",	1, NULL, "Kernel       : "},
-    {"kern-NC",		0, NULL, "Kernel       : "},
-    {"kern-NC_WSCONS",	0, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	0, "Kernel       : "},
+    {"kern-RPC_WSCONS",	1, "Kernel       : "},
+    {"kern-NC",		0, "Kernel       : "},
+    {"kern-NC_WSCONS",	0, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
-    {"xserver",		1, NULL, "X11 servers  : "},
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/alpha/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/alpha/md.h,v
retrieving revision 1.9
diff -u -r1.9 md.h
--- arch/alpha/md.h	2001/11/29 23:20:56	1.9
+++ arch/alpha/md.h	2003/04/04 15:31:17
@@ -51,24 +51,24 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
 #ifdef notyet
-    {"xserver",		1, NULL, "X11 servers  : "},
+    {"xserver",		1, "X11 servers  : "},
 #endif
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/amiga/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/amiga/md.h,v
retrieving revision 1.5
diff -u -r1.5 md.h
--- arch/amiga/md.h	2001/11/29 23:20:57	1.5
+++ arch/amiga/md.h	2003/04/04 15:31:17
@@ -64,23 +64,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, "ag", "Kernel       : "},
-    {"base",		1, "bw", "Base         : "},
-    {"etc",		1, "aa", "System (/etc): "},
-    {"comp",		1, "bl", "Compiler     : "},
-    {"games",		1, "am", "Games        : "},
-    {"man",		1, "ar", "Manuals      : "},
-    {"misc",		1, "aj", "Miscellaneous: "},
-    {"text",		1, "af", "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
-    {"xbase",		1, "al", "X11 clients  : "},
-    {"xfont",		1, "az", "X11 fonts    : "},
-    {"xserver",		1, "cr", "X11 servers  : "},
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ah", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/arc/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/arc/md.h,v
retrieving revision 1.2
diff -u -r1.2 md.h
--- arch/arc/md.h	2001/11/29 23:20:57	1.2
+++ arch/arc/md.h	2003/04/04 15:31:17
@@ -70,20 +70,20 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, NULL, "Kernel        : "},
-    {"base",		1, NULL, "Base          : "},
-    {"etc",		1, NULL, "System (/etc) : "},
-    {"comp",		1, NULL, "Compiler      : "},
-    {"games",		1, NULL, "Games         : "},
-    {"man",		1, NULL, "Manuals       : "},
-    {"misc",		1, NULL, "Miscellaneous : "},
-    {"text",		1, NULL, "Text tools    : "},
-    {"xbase",		1, NULL, "X11 clients   : "},
-    {"xfont",		1, NULL, "X11 fonts     : "},
-    {"xcontrib",	1, NULL, "X11 contrib   : "},
-    {"xcomp",		1, NULL, "X programming : "},
-    {"xmisc",		1, NULL, "X11 Misc.     : "},
-    {NULL, 0, NULL, NULL }
+    {"kern-GENERIC",	1, "Kernel        : "},
+    {"base",		1, "Base          : "},
+    {"etc",		1, "System (/etc) : "},
+    {"comp",		1, "Compiler      : "},
+    {"games",		1, "Games         : "},
+    {"man",		1, "Manuals       : "},
+    {"misc",		1, "Miscellaneous : "},
+    {"text",		1, "Text tools    : "},
+    {"xbase",		1, "X11 clients   : "},
+    {"xfont",		1, "X11 fonts     : "},
+    {"xcontrib",	1, "X11 contrib   : "},
+    {"xcomp",		1, "X programming : "},
+    {"xmisc",		1, "X11 Misc.     : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/atari/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/atari/md.h,v
retrieving revision 1.4
diff -u -r1.4 md.h
--- arch/atari/md.h	2002/06/19 11:44:26	1.4
+++ arch/atari/md.h	2003/04/04 15:31:17
@@ -74,26 +74,26 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-BOOT",	 1, "ag", "TT030/Falcon kernel : "},
-    {"kern-HADES",	 1, "ag", "Hades kernel        : "},
-    {"kern-MILAN-ISAIDE",1, "ag", "Milan ISAIDE kernel : "},
-    {"kern-MILAN-PCIIDE",1, "ag", "Milan PCIIDE kernel : "},
-    {"base",		 1, "bw", "Base                : "},
-    {"etc",		 1, "aa", "System (/etc)       : "},
-    {"comp",		 1, "bl", "Compiler            : "},
-    {"games",		 1, "am", "Games               : "},
-    {"man",		 1, "ar", "Manuals             : "},
-    {"misc",		 1, "aj", "Miscellaneous       : "},
-    {"text",		 1, "af", "Text tools          : "},
+    {"kern-BOOT",	 1, "TT030/Falcon kernel : "},
+    {"kern-HADES",	 1, "Hades kernel        : "},
+    {"kern-MILAN-ISAIDE",1, "Milan ISAIDE kernel : "},
+    {"kern-MILAN-PCIIDE",1, "Milan PCIIDE kernel : "},
+    {"base",		 1, "Base                : "},
+    {"etc",		 1, "System (/etc)       : "},
+    {"comp",		 1, "Compiler            : "},
+    {"games",		 1, "Games               : "},
+    {"man",		 1, "Manuals             : "},
+    {"misc",		 1, "Miscellaneous       : "},
+    {"text",		 1, "Text tools          : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
-    {"xbase",		 1, "al", "X11 clients         : "},
-    {"xfont",		 1, "az", "X11 fonts           : "},
-    {"xserver",		 1, "cr", "X11 servers         : "},
-    {"xcontrib",	 1, "aa", "X11 contrib         : "},
-    {"xcomp",		 1, "ah", "X programming       : "},
-    {"xmisc",		 1, NULL, "X11 Misc.           : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		 1, "X11 clients         : "},
+    {"xfont",		 1, "X11 fonts           : "},
+    {"xserver",		 1, "X11 servers         : "},
+    {"xcontrib",	 1, "X11 contrib         : "},
+    {"xcomp",		 1, "X programming       : "},
+    {"xmisc",		 1, "X11 Misc.           : "},
+    { NULL,		 0, NULL }
 }
 #endif
 ;
Index: arch/bebox/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/bebox/md.h,v
retrieving revision 1.6
diff -u -r1.6 md.h
--- arch/bebox/md.h	2001/11/29 23:20:57	1.6
+++ arch/bebox/md.h	2003/04/04 15:31:17
@@ -64,23 +64,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, "ae", "Kernel       : "},
-    {"base",		1, "bo", "Base         : "},
-    {"etc",		1, "aa", "System (/etc): "},
-    {"comp",		1, "bd", "Compiler     : "},
-    {"games",		1, "am", "Games        : "},
-    {"man",		1, "ak", "Manuals      : "},
-    {"misc",		1, "aj", "Miscellaneous: "},
-    {"text",		1, "ae", "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
-    {"xbase",		1, "al", "X11 clients  : "},
-    {"xfont",		1, "az", "X11 fonts    : "},
-    {"xserver",		1, "ci", "X11 servers  : "},
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ah", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/cats/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/cats/md.h,v
retrieving revision 1.2
diff -u -r1.2 md.h
--- arch/cats/md.h	2002/04/11 16:34:00	1.2
+++ arch/cats/md.h	2003/04/04 15:31:17
@@ -59,22 +59,22 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
-    {"xserver",		1, NULL, "X11 servers  : "},
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/evbarm/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/evbarm/md.h,v
retrieving revision 1.2
diff -u -r1.2 md.h
--- arch/evbarm/md.h	2002/04/13 02:34:18	1.2
+++ arch/evbarm/md.h	2003/04/04 15:31:17
@@ -56,25 +56,25 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-INTEGRATOR",		0, NULL, "Kernel       : "},
-    {"kern-IQ80310",		0, NULL, "Kernel       : "},
-    {"kern-IQ80321",		0, NULL, "Kernel       : "},
-    {"kern-TEAMASA_NPWR",	0, NULL, "Kernel       : "},
-    {"base",			1, NULL, "Base         : "},
-    {"etc",			1, NULL, "System (/etc): "},
-    {"comp",			1, NULL, "Compiler     : "},
-    {"games",			1, NULL, "Games        : "},
-    {"man",			1, NULL, "Manuals      : "},
-    {"misc",			1, NULL, "Miscellaneous: "},
-    {"text",			1, NULL, "Text tools   : "},
+    {"kern-INTEGRATOR",		0, "Kernel       : "},
+    {"kern-IQ80310",		0, "Kernel       : "},
+    {"kern-IQ80321",		0, "Kernel       : "},
+    {"kern-TEAMASA_NPWR",	0, "Kernel       : "},
+    {"base",			1, "Base         : "},
+    {"etc",			1, "System (/etc): "},
+    {"comp",			1, "Compiler     : "},
+    {"games",			1, "Games        : "},
+    {"man",			1, "Manuals      : "},
+    {"misc",			1, "Miscellaneous: "},
+    {"text",			1, "Text tools   : "},
 
-    {"xbase",			0, NULL, "X11 clients  : "},
-    {"xfont",			0, NULL, "X11 fonts    : "},
-    {"xserver",			0, NULL, "X11 servers  : "},
-    {"xcontrib",		0, NULL, "X11 contrib  : "},
-    {"xcomp",			0, NULL, "X programming: "},
-    {"xmisc",			0, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",			0, "X11 clients  : "},
+    {"xfont",			0, "X11 fonts    : "},
+    {"xserver",			0, "X11 servers  : "},
+    {"xcontrib",		0, "X11 contrib  : "},
+    {"xcomp",			0, "X programming: "},
+    {"xmisc",			0, "X11 Misc.    : "},
+    { NULL,			0, NULL }
 }
 #endif
 ;
Index: arch/evbppc/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/evbppc/md.h,v
retrieving revision 1.1
diff -u -r1.1 md.h
--- arch/evbppc/md.h	2002/12/09 14:13:14	1.1
+++ arch/evbppc/md.h	2003/04/04 15:31:17
@@ -64,23 +64,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, "ae", "Kernel       : "},
-    {"base",		1, "bo", "Base         : "},
-    {"etc",		1, "aa", "System (/etc): "},
-    {"comp",		1, "bd", "Compiler     : "},
-    {"games",		1, "am", "Games        : "},
-    {"man",		1, "ak", "Manuals      : "},
-    {"misc",		1, "aj", "Miscellaneous: "},
-    {"text",		1, "ae", "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
-    {"xbase",		1, "al", "X11 clients  : "},
-    {"xfont",		1, "az", "X11 fonts    : "},
-    {"xserver",		1, "ci", "X11 servers  : "},
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ah", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/hp300/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/hp300/md.h,v
retrieving revision 1.1
diff -u -r1.1 md.h
--- arch/hp300/md.h	2002/02/10 01:14:05	1.1
+++ arch/hp300/md.h	2003/04/04 15:31:17
@@ -77,25 +77,25 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, "ac", "Kernel       : "},
-    {"base",		1, "bs", "Base         : "},
-    {"etc",		1, "aa", "System (/etc): "},
-    {"comp",		1, "bj", "Compiler     : "},
-    {"games",		1, "am", "Games        : "},
-    {"man",		1, "ar", "Manuals      : "},
-    {"misc",		1, "aj", "Miscellaneous: "},
-    {"text",		1, "af", "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, "ak", "X11 clients  : "},
-    {"xfont",		1, "ay", "X11 fonts    : "},
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
 #if 0
     /* no xserver yet */
-    {"xserver",		1, "ag", "X11 servers  : "},
+    {"xserver",		1, "X11 servers  : "},
 #endif
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ag", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/hpcmips/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/hpcmips/md.h,v
retrieving revision 1.12
diff -u -r1.12 md.h
--- arch/hpcmips/md.h	2002/04/21 11:21:53	1.12
+++ arch/hpcmips/md.h	2003/04/04 15:31:24
@@ -70,24 +70,24 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, "ag", "Kernel       : "},
-    {"kern-TX3912",	0, "ag", "Kernel       : "},
-    {"base",		1, "bw", "Base         : "},
-    {"etc",		1, "aa", "System (/etc): "},
-    {"comp",		1, "bl", "Compiler     : "},
-    {"games",		1, "am", "Games        : "},
-    {"man",		1, "ar", "Manuals      : "},
-    {"misc",		1, "aj", "Miscellaneous: "},
-    {"text",		1, "af", "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"kern-TX3912",	0, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
-    {"xbase",		1, "al", "X11 clients  : "},
-    {"xfont",		1, "az", "X11 fonts    : "},
-    {"xserver",		1, "cr", "X11 servers  : "},
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ah", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/i386/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/i386/md.h,v
retrieving revision 1.33
diff -u -r1.33 md.h
--- arch/i386/md.h	2002/05/29 20:36:41	1.33
+++ arch/i386/md.h	2003/04/04 15:31:24
@@ -70,25 +70,25 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",		1, "aj", "Kernel        : "},
-    {"kern-GENERIC_TINY",	0, "aj", "Kernel        : "},
-    {"kern-GENERIC_LAPTOP",	0, "aj", "Kernel        : "},
-    {"kern-GENERIC_DIAGNOSTIC",	0, "aj", "Kernel        : "},
-    {"kern-GENERIC_PS2TINY",	0, "aj", "Kernel        : "},
-    {"base",			1, "cr", "Base          : "},
-    {"etc",			1, "aa", "System (/etc) : "},
-    {"comp",			1, "ca", "Compiler      : "},
-    {"games",			1, "am", "Games         : "},
-    {"man",			1, "ax", "Manuals       : "},
-    {"misc",			1, "aj", "Miscellaneous : "},
-    {"text",			1, "af", "Text tools    : "},
-    {"xbase",			1, "al", "X11 clients   : "},
-    {"xfont",			1, "az", "X11 fonts     : "},
-    {"xserver",			1, "ck", "X11 servers   : "},
-    {"xcontrib",		1, "aa", "X11 contrib   : "},
-    {"xcomp",			1, "ah", "X programming : "},
-    {"xmisc",			1, "aa", "X11 Misc.     : "},
-    {NULL, 0, NULL, NULL }
+    {"kern-GENERIC",		1, "Kernel        : "},
+    {"kern-GENERIC_TINY",	0, "Kernel        : "},
+    {"kern-GENERIC_LAPTOP",	0, "Kernel        : "},
+    {"kern-GENERIC_DIAGNOSTIC",	0, "Kernel        : "},
+    {"kern-GENERIC_PS2TINY",	0, "Kernel        : "},
+    {"base",			1, "Base          : "},
+    {"etc",			1, "System (/etc) : "},
+    {"comp",			1, "Compiler      : "},
+    {"games",			1, "Games         : "},
+    {"man",			1, "Manuals       : "},
+    {"misc",			1, "Miscellaneous : "},
+    {"text",			1, "Text tools    : "},
+    {"xbase",			1, "X11 clients   : "},
+    {"xfont",			1, "X11 fonts     : "},
+    {"xserver",			1, "X11 servers   : "},
+    {"xcontrib",		1, "X11 contrib   : "},
+    {"xcomp",			1, "X programming : "},
+    {"xmisc",			1, "X11 Misc.     : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/mac68k/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/mac68k/md.h,v
retrieving revision 1.13
diff -u -r1.13 md.h
--- arch/mac68k/md.h	2003/01/11 19:28:04	1.13
+++ arch/mac68k/md.h	2003/04/04 15:31:24
@@ -259,23 +259,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	0, NULL, "Kernel       : "},
-    {"kern-GENERICSBC",	0, NULL, "Kernel (SBC) : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	0, "Kernel       : "},
+    {"kern-GENERICSBC",	0, "Kernel (SBC) : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
-    {"xserver",		1, NULL, "X11 servers  : "},
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/macppc/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/macppc/md.h,v
retrieving revision 1.7
diff -u -r1.7 md.h
--- arch/macppc/md.h	2001/11/29 23:20:59	1.7
+++ arch/macppc/md.h	2003/04/04 15:31:24
@@ -51,22 +51,22 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
-    {"xserver",		1, NULL, "X11 servers  : "},
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/mipsco/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/mipsco/md.h,v
retrieving revision 1.2
diff -u -r1.2 md.h
--- arch/mipsco/md.h	2001/11/29 23:20:59	1.2
+++ arch/mipsco/md.h	2003/04/04 15:31:24
@@ -67,24 +67,24 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
 #ifdef notyet
-    {"xserver",		1, NULL, "X11 servers  : "},
+    {"xserver",		1, "X11 servers  : "},
 #endif
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/mvme68k/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/mvme68k/md.h,v
retrieving revision 1.1
diff -u -r1.1 md.h
--- arch/mvme68k/md.h	2002/03/24 22:04:05	1.1
+++ arch/mvme68k/md.h	2003/04/04 15:31:24
@@ -77,25 +77,25 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, "ac", "Kernel       : "},
-    {"base",		1, "bs", "Base         : "},
-    {"etc",		1, "aa", "System (/etc): "},
-    {"comp",		1, "bj", "Compiler     : "},
-    {"games",		1, "am", "Games        : "},
-    {"man",		1, "ar", "Manuals      : "},
-    {"misc",		1, "aj", "Miscellaneous: "},
-    {"text",		1, "af", "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, "ak", "X11 clients  : "},
-    {"xfont",		1, "ay", "X11 fonts    : "},
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
 #if 0
     /* no xserver until vmebus graphics cards supported */
-    {"xserver",		1, "ag", "X11 servers  : "},
+    {"xserver",		1, "X11 servers  : "},
 #endif
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ag", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/news68k/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/news68k/md.h,v
retrieving revision 1.10
diff -u -r1.10 md.h
--- arch/news68k/md.h	2002/06/02 17:28:35	1.10
+++ arch/news68k/md.h	2003/04/04 15:31:24
@@ -64,23 +64,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",		1, NULL, "Kernel       : "},
-    {"kern-GENERIC_TINY",	0, NULL, "Kernel       : "},
-    {"base",			1, NULL, "Base         : "},
-    {"etc",			1, NULL, "System (/etc): "},
-    {"comp",			1, NULL, "Compiler     : "},
-    {"games",			1, NULL, "Games        : "},
-    {"man",			1, NULL, "Manuals      : "},
-    {"misc",			1, NULL, "Miscellaneous: "},
-    {"text",			1, NULL, "Text tools   : "},
+    {"kern-GENERIC",		1, "Kernel       : "},
+    {"kern-GENERIC_TINY",	0, "Kernel       : "},
+    {"base",			1, "Base         : "},
+    {"etc",			1, "System (/etc): "},
+    {"comp",			1, "Compiler     : "},
+    {"games",			1, "Games        : "},
+    {"man",			1, "Manuals      : "},
+    {"misc",			1, "Miscellaneous: "},
+    {"text",			1, "Text tools   : "},
 
-    {"xbase",			1, NULL, "X11 clients  : "},
-    {"xfont",			0, NULL, "X11 fonts    : "},
-    {"xserver",			0, NULL, "X11 servers  : "},
-    {"xcontrib",		1, NULL, "X11 contrib  : "},
-    {"xcomp",			1, NULL, "X programming: "},
-    {"xmisc",			1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",			1, "X11 clients  : "},
+    {"xfont",			0, "X11 fonts    : "},
+    {"xserver",			0, "X11 servers  : "},
+    {"xcontrib",		1, "X11 contrib  : "},
+    {"xcomp",			1, "X programming: "},
+    {"xmisc",			1, "X11 Misc.    : "},
+    { NULL,			0, NULL }
 }
 #endif
 ;
Index: arch/newsmips/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/newsmips/md.h,v
retrieving revision 1.1
diff -u -r1.1 md.h
--- arch/newsmips/md.h	2002/03/16 15:47:56	1.1
+++ arch/newsmips/md.h	2003/04/04 15:31:24
@@ -64,22 +64,22 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",		1, NULL, "Kernel       : "},
-    {"base",			1, NULL, "Base         : "},
-    {"etc",			1, NULL, "System (/etc): "},
-    {"comp",			1, NULL, "Compiler     : "},
-    {"games",			1, NULL, "Games        : "},
-    {"man",			1, NULL, "Manuals      : "},
-    {"misc",			1, NULL, "Miscellaneous: "},
-    {"text",			1, NULL, "Text tools   : "},
+    {"kern-GENERIC",		1, "Kernel       : "},
+    {"base",			1, "Base         : "},
+    {"etc",			1, "System (/etc): "},
+    {"comp",			1, "Compiler     : "},
+    {"games",			1, "Games        : "},
+    {"man",			1, "Manuals      : "},
+    {"misc",			1, "Miscellaneous: "},
+    {"text",			1, "Text tools   : "},
 
-    {"xbase",			1, NULL, "X11 clients  : "},
-    {"xfont",			0, NULL, "X11 fonts    : "},
-    {"xserver",			0, NULL, "X11 servers  : "},
-    {"xcontrib",		1, NULL, "X11 contrib  : "},
-    {"xcomp",			1, NULL, "X programming: "},
-    {"xmisc",			1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",			1, "X11 clients  : "},
+    {"xfont",			0, "X11 fonts    : "},
+    {"xserver",			0, "X11 servers  : "},
+    {"xcontrib",		1, "X11 contrib  : "},
+    {"xcomp",			1, "X programming: "},
+    {"xmisc",			1, "X11 Misc.    : "},
+    { NULL,			0, NULL }
 }
 #endif
 ;
Index: arch/pc532/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/pc532/md.h,v
retrieving revision 1.10
diff -u -r1.10 md.h
--- arch/pc532/md.h	2000/07/25 18:17:08	1.10
+++ arch/pc532/md.h	2003/04/04 15:31:24
@@ -74,14 +74,14 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"base",	1, NULL, "Base         : "},
-    {"etc",	1, NULL, "System (/etc): "},
-    {"comp",	1, NULL, "Compiler     : "},
-    {"games",	1, NULL, "Games        : "},
-    {"man",	1, NULL, "Manuals      : "},
-    {"misc",	1, NULL, "Miscellaneous: "},
-    {"text",	1, NULL, "Text tools   : "},
-    {NULL, 0, NULL, NULL }
+    {"base",	1, "Base         : "},
+    {"etc",	1, "System (/etc): "},
+    {"comp",	1, "Compiler     : "},
+    {"games",	1, "Games        : "},
+    {"man",	1, "Manuals      : "},
+    {"misc",	1, "Miscellaneous: "},
+    {"text",	1, "Text tools   : "},
+    { NULL,	0, NULL }
 }
 #endif
 ;
Index: arch/playstation2/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/playstation2/md.h,v
retrieving revision 1.3
diff -u -r1.3 md.h
--- arch/playstation2/md.h	2002/05/18 07:14:31	1.3
+++ arch/playstation2/md.h	2003/04/04 15:31:24
@@ -68,15 +68,15 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, "ag", "Kernel       : "},
-    {"base",		1, "bw", "Base         : "},
-    {"etc",		1, "aa", "System (/etc): "},
-    {"comp",		1, "bl", "Compiler     : "},
-    {"games",		1, "am", "Games        : "},
-    {"man",		1, "ar", "Manuals      : "},
-    {"misc",		1, "aj", "Miscellaneous: "},
-    {"text",		1, "af", "Text tools   : "},
-    {NULL, 0, NULL, NULL }
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/pmax/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/pmax/md.h,v
retrieving revision 1.20
diff -u -r1.20 md.h
--- arch/pmax/md.h	2001/11/29 23:21:00	1.20
+++ arch/pmax/md.h	2003/04/04 15:31:24
@@ -89,22 +89,22 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
-    {"xserver",		1, NULL, "X11 servers  : "},
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/prep/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/prep/md.h,v
retrieving revision 1.2
diff -u -r1.2 md.h
--- arch/prep/md.h	2001/11/29 23:21:01	1.2
+++ arch/prep/md.h	2003/04/04 15:31:24
@@ -78,23 +78,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, "ag", "Kernel       : "},
-    {"base",		1, "bw", "Base         : "},
-    {"etc",		1, "aa", "System (/etc): "},
-    {"comp",		1, "bl", "Compiler     : "},
-    {"games",		1, "am", "Games        : "},
-    {"man",		1, "ar", "Manuals      : "},
-    {"misc",		1, "aj", "Miscellaneous: "},
-    {"text",		1, "af", "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
-    {"xbase",		1, "al", "X11 clients  : "},
-    {"xfont",		1, "az", "X11 fonts    : "},
-    {"xserver",		0, "cr", "X11 servers  : "},
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ah", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		0, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/sandpoint/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/sandpoint/md.h,v
retrieving revision 1.2
diff -u -r1.2 md.h
--- arch/sandpoint/md.h	2001/11/29 23:21:01	1.2
+++ arch/sandpoint/md.h	2003/04/04 15:31:24
@@ -64,23 +64,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, "ae", "Kernel       : "},
-    {"base",		1, "bo", "Base         : "},
-    {"etc",		1, "aa", "System (/etc): "},
-    {"comp",		1, "bd", "Compiler     : "},
-    {"games",		1, "am", "Games        : "},
-    {"man",		1, "ak", "Manuals      : "},
-    {"misc",		1, "aj", "Miscellaneous: "},
-    {"text",		1, "ae", "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
-    {"xbase",		1, "al", "X11 clients  : "},
-    {"xfont",		1, "az", "X11 fonts    : "},
-    {"xserver",		1, "ci", "X11 servers  : "},
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ah", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/sgimips/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/sgimips/md.h,v
retrieving revision 1.6
diff -u -r1.6 md.h
--- arch/sgimips/md.h	2002/07/15 04:51:41	1.6
+++ arch/sgimips/md.h	2003/04/04 15:31:24
@@ -94,22 +94,22 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC_INDY",	1, NULL, "Indy/I2 Kernel: "},
-    {"base",			1, NULL, "Base          : "},
-    {"etc",			1, NULL, "System (/etc) : "},
-    {"comp",			1, NULL, "Compiler      : "},
-    {"games",			1, NULL, "Games         : "},
-    {"man",			1, NULL, "Manuals       : "},
-    {"misc",			1, NULL, "Miscellaneous : "},
-    {"text",			1, NULL, "Text tools    : "},
+    {"kern-GENERIC_INDY",	1, "Indy/I2 Kernel: "},
+    {"base",			1, "Base          : "},
+    {"etc",			1, "System (/etc) : "},
+    {"comp",			1, "Compiler      : "},
+    {"games",			1, "Games         : "},
+    {"man",			1, "Manuals       : "},
+    {"misc",			1, "Miscellaneous : "},
+    {"text",			1, "Text tools    : "},
 
-    {"xbase",			0, NULL, "X11 clients   : "},
-    {"xfont",			0, NULL, "X11 fonts     : "},
-    {"xserver",			0, NULL, "X11 servers   : "},
-    {"xcontrib",		0, NULL, "X11 contrib   : "},
-    {"xcomp",			0, NULL, "X programming : "},
-    {"xmisc",			0, NULL, "X11 Misc.     : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",			0, "X11 clients   : "},
+    {"xfont",			0, "X11 fonts     : "},
+    {"xserver",			0, "X11 servers   : "},
+    {"xcontrib",		0, "X11 contrib   : "},
+    {"xcomp",			0, "X programming : "},
+    {"xmisc",			0, "X11 Misc.     : "},
+    { NULL,			0, NULL }
 }
 #endif
 ;
Index: arch/shark/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/shark/md.h,v
retrieving revision 1.3
diff -u -r1.3 md.h
--- arch/shark/md.h	2002/04/02 17:02:54	1.3
+++ arch/shark/md.h	2003/04/04 15:31:24
@@ -56,22 +56,22 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
-    {"xserver",		1, NULL, "X11 servers  : "},
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/sparc/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/sparc/md.h,v
retrieving revision 1.12
diff -u -r1.12 md.h
--- arch/sparc/md.h	2003/02/19 02:09:46	1.12
+++ arch/sparc/md.h	2003/04/04 15:31:24
@@ -67,24 +67,24 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",		1, NULL, "Kernel       : "},
-    {"kern-GENERIC_SCSI3",	0, NULL, "Kernel(SCSI3): "},
-    {"kern-GENERIC_SUN4U",	0, NULL, "Kernel(SUN4U): "},
-    {"base",			1, NULL, "Base         : "},
-    {"etc",			1, NULL, "System (/etc): "},
-    {"comp",			1, NULL, "Compiler     : "},
-    {"games",			1, NULL, "Games        : "},
-    {"man",			1, NULL, "Manuals      : "},
-    {"misc",			1, NULL, "Miscellaneous: "},
-    {"text",			1, NULL, "Text tools   : "},
+    {"kern-GENERIC",		1, "Kernel       : "},
+    {"kern-GENERIC_SCSI3",	0, "Kernel(SCSI3): "},
+    {"kern-GENERIC_SUN4U",	0, "Kernel(SUN4U): "},
+    {"base",			1, "Base         : "},
+    {"etc",			1, "System (/etc): "},
+    {"comp",			1, "Compiler     : "},
+    {"games",			1, "Games        : "},
+    {"man",			1, "Manuals      : "},
+    {"misc",			1, "Miscellaneous: "},
+    {"text",			1, "Text tools   : "},
 
-    {"xbase",			1, NULL, "X11 clients  : "},
-    {"xfont",			1, NULL, "X11 fonts    : "},
-    {"xserver",			1, NULL, "X11 servers  : "},
-    {"xcontrib",		1, NULL, "X11 contrib  : "},
-    {"xcomp",			1, NULL, "X programming: "},
-    {"xmisc",			1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",			1, "X11 clients  : "},
+    {"xfont",			1, "X11 fonts    : "},
+    {"xserver",			1, "X11 servers  : "},
+    {"xcontrib",		1, "X11 contrib  : "},
+    {"xcomp",			1, "X programming: "},
+    {"xmisc",			1, "X11 Misc.    : "},
+    { NULL,			0, NULL }
 }
 #endif
 ;
Index: arch/sparc64/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/sparc64/md.h,v
retrieving revision 1.4
diff -u -r1.4 md.h
--- arch/sparc64/md.h	2001/11/29 23:21:02	1.4
+++ arch/sparc64/md.h	2003/04/04 15:31:24
@@ -64,22 +64,22 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
-    {"xserver",		1, NULL, "X11 servers  : "},
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/vax/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/vax/md.h,v
retrieving revision 1.9
diff -u -r1.9 md.h
--- arch/vax/md.h	2002/03/30 21:55:11	1.9
+++ arch/vax/md.h	2003/04/04 15:31:24
@@ -64,22 +64,22 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
-    {"xserver",		1, NULL, "X11 servers  : "},
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/x68k/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/x68k/md.h,v
retrieving revision 1.7
diff -u -r1.7 md.h
--- arch/x68k/md.h	2001/11/29 23:21:03	1.7
+++ arch/x68k/md.h	2003/04/04 15:31:24
@@ -80,23 +80,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, "ac", "Kernel       : "},
-    {"base",		1, "bs", "Base         : "},
-    {"etc",		1, "aa", "System (/etc): "},
-    {"comp",		1, "bj", "Compiler     : "},
-    {"games",		1, "am", "Games        : "},
-    {"man",		1, "ar", "Manuals      : "},
-    {"misc",		1, "aj", "Miscellaneous: "},
-    {"text",		1, "af", "Text tools   : "},
+    {"kern-GENERIC",	1, "Kernel       : "},
+    {"base",		1, "Base         : "},
+    {"etc",		1, "System (/etc): "},
+    {"comp",		1, "Compiler     : "},
+    {"games",		1, "Games        : "},
+    {"man",		1, "Manuals      : "},
+    {"misc",		1, "Miscellaneous: "},
+    {"text",		1, "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
-    {"xbase",		1, "ak", "X11 clients  : "},
-    {"xfont",		1, "ay", "X11 fonts    : "},
-    {"xserver",		1, "ag", "X11 servers  : "},
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ag", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",		1, "X11 clients  : "},
+    {"xfont",		1, "X11 fonts    : "},
+    {"xserver",		1, "X11 servers  : "},
+    {"xcontrib",	1, "X11 contrib  : "},
+    {"xcomp",		1, "X programming: "},
+    {"xmisc",		1, "X11 Misc.    : "},
+    { NULL,		0, NULL }
 }
 #endif
 ;
Index: arch/x86_64/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/x86_64/md.h,v
retrieving revision 1.2
diff -u -r1.2 md.h
--- arch/x86_64/md.h	2002/12/10 20:08:46	1.2
+++ arch/x86_64/md.h	2003/04/04 15:31:24
@@ -70,23 +70,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern",			1, "aj", "Kernel        : "},
-    {"base",			1, "cr", "Base          : "},
-    {"etc",			1, "aa", "System (/etc) : "},
-    {"comp",			1, "ca", "Compiler      : "},
-    {"games",			1, "am", "Games         : "},
-    {"man",			1, "ax", "Manuals       : "},
-    {"misc",			1, "aj", "Miscellaneous : "},
-    {"text",			1, "af", "Text tools    : "},
+    {"kern",			1, "Kernel        : "},
+    {"base",			1, "Base          : "},
+    {"etc",			1, "System (/etc) : "},
+    {"comp",			1, "Compiler      : "},
+    {"games",			1, "Games         : "},
+    {"man",			1, "Manuals       : "},
+    {"misc",			1, "Miscellaneous : "},
+    {"text",			1, "Text tools    : "},
 #if 0
-    {"xbase",			1, "al", "X11 clients   : "},
-    {"xfont",			1, "az", "X11 fonts     : "},
-    {"xserver",			1, "ck", "X11 servers   : "},
-    {"xcontrib",		1, "aa", "X11 contrib   : "},
-    {"xcomp",			1, "ah", "X programming : "},
-    {"xmisc",			1, "aa", "X11 Misc.     : "},
+    {"xbase",			1, "X11 clients   : "},
+    {"xfont",			1, "X11 fonts     : "},
+    {"xserver",			1, "X11 servers   : "},
+    {"xcontrib",		1, "X11 contrib   : "},
+    {"xcomp",			1, "X programming : "},
+    {"xmisc",			1, "X11 Misc.     : "},
 #endif
-    {NULL, 0, NULL, NULL }
+    { NULL,			0, NULL }
 }
 #endif
 ;