Subject: Re: install/5050 - Fix for this PR?
To: None <tech-install@netbsd.org>
From: Julio Merino <jmmv@menta.net>
List: tech-install
Date: 02/01/2003 12:11:20
Hello,

What about the following fix for this PR? This seems the best solution
imho, as we let the user choose how many chunks he wants (and lets him
write chunks of any size). As he will be writting disks, he will know
how many disks contain each set.

Just to say that the hardcoded number of floppies is out of sync with
reality. I tried to install 1.6 and had to figure which was the proper
chunk size to create each disk set (so they matched the value in sysint).

Here is the patch. Comments?

Index: menus.mi.en
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/menus.mi.en,v
retrieving revision 1.63
diff -u -u -r1.63 menus.mi.en
--- menus.mi.en	2003/01/22 05:59:07	1.63
+++ menus.mi.en	2003/02/01 10:37:57
@@ -329,6 +329,7 @@
 
 menu fdremount, title "What do you want to do?";
 	option "Try again", exit, action { yesno = 1; };
+	option "Set is finished", exit, action { yesno = 2; };
 	option "Abort install", exit, action { yesno = 0; };
 
 menu fdok, title "Hit enter to continue";
Index: msg.mi.en
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/msg.mi.en,v
retrieving revision 1.95
diff -u -u -r1.95 msg.mi.en
--- msg.mi.en	2003/01/22 05:59:07	1.95
+++ msg.mi.en	2003/02/01 10:37:57
@@ -720,7 +720,10 @@
 
 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.
+
+Alternatively you can hit "Set is finished" if you have no more disks
+for this set.}
 
 message fdremount
 {The floppy was not mounted successfully.  You may:
Index: util.c
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/util.c,v
retrieving revision 1.81
diff -u -u -r1.81 util.c
--- util.c	2003/01/22 05:59:08	1.81
+++ util.c	2003/02/01 10:37:59
@@ -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)) {
Index: arch/amiga/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/amiga/md.h,v
retrieving revision 1.5
diff -u -u -r1.5 md.h
--- arch/amiga/md.h	2001/11/29 23:20:57	1.5
+++ arch/amiga/md.h	2003/02/01 10:37:59
@@ -64,14 +64,14 @@
 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, "zz", "Kernel       : "},
+    {"base",		1, "zz", "Base         : "},
+    {"etc",		1, "zz", "System (/etc): "},
+    {"comp",		1, "zz", "Compiler     : "},
+    {"games",		1, "zz", "Games        : "},
+    {"man",		1, "zz", "Manuals      : "},
+    {"misc",		1, "zz", "Miscellaneous: "},
+    {"text",		1, "zz", "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
     {"xbase",		1, "al", "X11 clients  : "},
Index: arch/atari/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/atari/md.h,v
retrieving revision 1.4
diff -u -u -r1.4 md.h
--- arch/atari/md.h	2002/06/19 11:44:26	1.4
+++ arch/atari/md.h	2003/02/01 10:37:59
@@ -74,25 +74,25 @@
 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, "zz", "TT030/Falcon kernel : "},
+    {"kern-HADES",	 1, "zz", "Hades kernel        : "},
+    {"kern-MILAN-ISAIDE",1, "zz", "Milan ISAIDE kernel : "},
+    {"kern-MILAN-PCIIDE",1, "zz", "Milan PCIIDE kernel : "},
+    {"base",		 1, "zz", "Base                : "},
+    {"etc",		 1, "zz", "System (/etc)       : "},
+    {"comp",		 1, "zz", "Compiler            : "},
+    {"games",		 1, "zz", "Games               : "},
+    {"man",		 1, "zz", "Manuals             : "},
+    {"misc",		 1, "zz", "Miscellaneous       : "},
+    {"text",		 1, "zz", "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.           : "},
+    {"xbase",		 1, "zz", "X11 clients         : "},
+    {"xfont",		 1, "zz", "X11 fonts           : "},
+    {"xserver",		 1, "zz", "X11 servers         : "},
+    {"xcontrib",	 1, "zz", "X11 contrib         : "},
+    {"xcomp",		 1, "zz", "X programming       : "},
+    {"xmisc",		 1, "zz", "X11 Misc.           : "},
     {NULL, 0, NULL, 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 -u -r1.6 md.h
--- arch/bebox/md.h	2001/11/29 23:20:57	1.6
+++ arch/bebox/md.h	2003/02/01 10:37:59
@@ -64,14 +64,14 @@
 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, "zz", "Kernel       : "},
+    {"base",		1, "zz", "Base         : "},
+    {"etc",		1, "zz", "System (/etc): "},
+    {"comp",		1, "zz", "Compiler     : "},
+    {"games",		1, "zz", "Games        : "},
+    {"man",		1, "zz", "Manuals      : "},
+    {"misc",		1, "zz", "Miscellaneous: "},
+    {"text",		1, "zz", "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
     {"xbase",		1, "al", "X11 clients  : "},
Index: arch/evbppc/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/evbppc/md.h,v
retrieving revision 1.1
diff -u -u -r1.1 md.h
--- arch/evbppc/md.h	2002/12/09 14:13:14	1.1
+++ arch/evbppc/md.h	2003/02/01 10:37:59
@@ -64,14 +64,14 @@
 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, "zz", "Kernel       : "},
+    {"base",		1, "zz", "Base         : "},
+    {"etc",		1, "zz", "System (/etc): "},
+    {"comp",		1, "zz", "Compiler     : "},
+    {"games",		1, "zz", "Games        : "},
+    {"man",		1, "zz", "Manuals      : "},
+    {"misc",		1, "zz", "Miscellaneous: "},
+    {"text",		1, "zz", "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
     {"xbase",		1, "al", "X11 clients  : "},
Index: arch/hp300/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/hp300/md.h,v
retrieving revision 1.1
diff -u -u -r1.1 md.h
--- arch/hp300/md.h	2002/02/10 01:14:05	1.1
+++ arch/hp300/md.h	2003/02/01 10:37:59
@@ -77,24 +77,24 @@
 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, "zz", "Kernel       : "},
+    {"base",		1, "zz", "Base         : "},
+    {"etc",		1, "zz", "System (/etc): "},
+    {"comp",		1, "zz", "Compiler     : "},
+    {"games",		1, "zz", "Games        : "},
+    {"man",		1, "zz", "Manuals      : "},
+    {"misc",		1, "zz", "Miscellaneous: "},
+    {"text",		1, "zz", "Text tools   : "},
 
-    {"xbase",		1, "ak", "X11 clients  : "},
-    {"xfont",		1, "ay", "X11 fonts    : "},
+    {"xbase",		1, "zz", "X11 clients  : "},
+    {"xfont",		1, "zz", "X11 fonts    : "},
 #if 0
     /* no xserver yet */
-    {"xserver",		1, "ag", "X11 servers  : "},
+    {"xserver",		1, "zz", "X11 servers  : "},
 #endif
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ag", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
+    {"xcontrib",	1, "zz", "X11 contrib  : "},
+    {"xcomp",		1, "zz", "X programming: "},
+    {"xmisc",		1, "zz", "X11 Misc.    : "},
     {NULL, 0, NULL, 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 -u -r1.12 md.h
--- arch/hpcmips/md.h	2002/04/21 11:21:53	1.12
+++ arch/hpcmips/md.h	2003/02/01 10:37:59
@@ -70,23 +70,23 @@
 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, "zz", "Kernel       : "},
+    {"kern-TX3912",	0, "zz", "Kernel       : "},
+    {"base",		1, "zz", "Base         : "},
+    {"etc",		1, "zz", "System (/etc): "},
+    {"comp",		1, "zz", "Compiler     : "},
+    {"games",		1, "zz", "Games        : "},
+    {"man",		1, "zz", "Manuals      : "},
+    {"misc",		1, "zz", "Miscellaneous: "},
+    {"text",		1, "zz", "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.    : "},
+    {"xbase",		1, "zz", "X11 clients  : "},
+    {"xfont",		1, "zz", "X11 fonts    : "},
+    {"xserver",		1, "zz", "X11 servers  : "},
+    {"xcontrib",	1, "zz", "X11 contrib  : "},
+    {"xcomp",		1, "zz", "X programming: "},
+    {"xmisc",		1, "zz", "X11 Misc.    : "},
     {NULL, 0, NULL, 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 -u -r1.33 md.h
--- arch/i386/md.h	2002/05/29 20:36:41	1.33
+++ arch/i386/md.h	2003/02/01 10:37:59
@@ -62,7 +62,7 @@
  *      xbase, xfont, xserver, xcontrib, xcomp.
  *
  * i386 has the  MD set kern first, because generic kernels are  too
- * big to fit on install floppies. i386 does not yet include the x sets. 
+ * big to fit on install floppies.
  *
  * Third entry is the last extension name in the split sets for loading
  * from floppy.
@@ -70,24 +70,24 @@
 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.     : "},
+    {"kern-GENERIC",		1, "zz", "Kernel        : "},
+    {"kern-GENERIC_TINY",	0, "zz", "Kernel        : "},
+    {"kern-GENERIC_LAPTOP",	0, "zz", "Kernel        : "},
+    {"kern-GENERIC_DIAGNOSTIC",	0, "zz", "Kernel        : "},
+    {"kern-GENERIC_PS2TINY",	0, "zz", "Kernel        : "},
+    {"base",			1, "zz", "Base          : "},
+    {"etc",			1, "zz", "System (/etc) : "},
+    {"comp",			1, "zz", "Compiler      : "},
+    {"games",			1, "zz", "Games         : "},
+    {"man",			1, "zz", "Manuals       : "},
+    {"misc",			1, "zz", "Miscellaneous : "},
+    {"text",			1, "zz", "Text tools    : "},
+    {"xbase",			1, "zz", "X11 clients   : "},
+    {"xfont",			1, "zz", "X11 fonts     : "},
+    {"xserver",			1, "zz", "X11 servers   : "},
+    {"xcontrib",		1, "zz", "X11 contrib   : "},
+    {"xcomp",			1, "zz", "X programming : "},
+    {"xmisc",			1, "zz", "X11 Misc.     : "},
     {NULL, 0, NULL, 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 -u -r1.1 md.h
--- arch/mvme68k/md.h	2002/03/24 22:04:05	1.1
+++ arch/mvme68k/md.h	2003/02/01 10:37:59
@@ -77,24 +77,24 @@
 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, "zz", "Kernel       : "},
+    {"base",		1, "zz", "Base         : "},
+    {"etc",		1, "zz", "System (/etc): "},
+    {"comp",		1, "zz", "Compiler     : "},
+    {"games",		1, "zz", "Games        : "},
+    {"man",		1, "zz", "Manuals      : "},
+    {"misc",		1, "zz", "Miscellaneous: "},
+    {"text",		1, "zz", "Text tools   : "},
 
-    {"xbase",		1, "ak", "X11 clients  : "},
-    {"xfont",		1, "ay", "X11 fonts    : "},
+    {"xbase",		1, "zz", "X11 clients  : "},
+    {"xfont",		1, "zz", "X11 fonts    : "},
 #if 0
     /* no xserver until vmebus graphics cards supported */
-    {"xserver",		1, "ag", "X11 servers  : "},
+    {"xserver",		1, "zz", "X11 servers  : "},
 #endif
-    {"xcontrib",	1, "aa", "X11 contrib  : "},
-    {"xcomp",		1, "ag", "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
+    {"xcontrib",	1, "zz", "X11 contrib  : "},
+    {"xcomp",		1, "zz", "X programming: "},
+    {"xmisc",		1, "zz", "X11 Misc.    : "},
     {NULL, 0, NULL, 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 -u -r1.3 md.h
--- arch/playstation2/md.h	2002/05/18 07:14:31	1.3
+++ arch/playstation2/md.h	2003/02/01 10:37:59
@@ -68,14 +68,14 @@
 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, "zz", "Kernel       : "},
+    {"base",		1, "zz", "Base         : "},
+    {"etc",		1, "zz", "System (/etc): "},
+    {"comp",		1, "zz", "Compiler     : "},
+    {"games",		1, "zz", "Games        : "},
+    {"man",		1, "zz", "Manuals      : "},
+    {"misc",		1, "zz", "Miscellaneous: "},
+    {"text",		1, "zz", "Text tools   : "},
     {NULL, 0, NULL, 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 -u -r1.2 md.h
--- arch/prep/md.h	2001/11/29 23:21:01	1.2
+++ arch/prep/md.h	2003/02/01 10:37:59
@@ -78,22 +78,22 @@
 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, "zz", "Kernel       : "},
+    {"base",		1, "zz", "Base         : "},
+    {"etc",		1, "zz", "System (/etc): "},
+    {"comp",		1, "zz", "Compiler     : "},
+    {"games",		1, "zz", "Games        : "},
+    {"man",		1, "zz", "Manuals      : "},
+    {"misc",		1, "zz", "Miscellaneous: "},
+    {"text",		1, "zz", "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.    : "},
+    {"xbase",		1, "zz", "X11 clients  : "},
+    {"xfont",		1, "zz", "X11 fonts    : "},
+    {"xserver",		0, "zz", "X11 servers  : "},
+    {"xcontrib",	1, "zz", "X11 contrib  : "},
+    {"xcomp",		1, "zz", "X programming: "},
+    {"xmisc",		1, "zz", "X11 Misc.    : "},
     {NULL, 0, NULL, 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 -u -r1.2 md.h
--- arch/sandpoint/md.h	2001/11/29 23:21:01	1.2
+++ arch/sandpoint/md.h	2003/02/01 10:37:59
@@ -64,22 +64,22 @@
 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, "zz", "Kernel       : "},
+    {"base",		1, "zz", "Base         : "},
+    {"etc",		1, "zz", "System (/etc): "},
+    {"comp",		1, "zz", "Compiler     : "},
+    {"games",		1, "zz", "Games        : "},
+    {"man",		1, "zz", "Manuals      : "},
+    {"misc",		1, "zz", "Miscellaneous: "},
+    {"text",		1, "zz", "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.    : "},
+    {"xbase",		1, "zz", "X11 clients  : "},
+    {"xfont",		1, "zz", "X11 fonts    : "},
+    {"xserver",		1, "zz", "X11 servers  : "},
+    {"xcontrib",	1, "zz", "X11 contrib  : "},
+    {"xcomp",		1, "zz", "X programming: "},
+    {"xmisc",		1, "zz", "X11 Misc.    : "},
     {NULL, 0, NULL, 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 -u -r1.7 md.h
--- arch/x68k/md.h	2001/11/29 23:21:03	1.7
+++ arch/x68k/md.h	2003/02/01 10:37:59
@@ -80,22 +80,22 @@
 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, "zz", "Kernel       : "},
+    {"base",		1, "zz", "Base         : "},
+    {"etc",		1, "zz", "System (/etc): "},
+    {"comp",		1, "zz", "Compiler     : "},
+    {"games",		1, "zz", "Games        : "},
+    {"man",		1, "zz", "Manuals      : "},
+    {"misc",		1, "zz", "Miscellaneous: "},
+    {"text",		1, "zz", "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.    : "},
+    {"xbase",		1, "zz", "X11 clients  : "},
+    {"xfont",		1, "zz", "X11 fonts    : "},
+    {"xserver",		1, "zz", "X11 servers  : "},
+    {"xcontrib",	1, "zz", "X11 contrib  : "},
+    {"xcomp",		1, "zz", "X programming: "},
+    {"xmisc",		1, "zz", "X11 Misc.    : "},
     {NULL, 0, NULL, 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 -u -r1.2 md.h
--- arch/x86_64/md.h	2002/12/10 20:08:46	1.2
+++ arch/x86_64/md.h	2003/02/01 10:37:59
@@ -70,21 +70,21 @@
 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, "zz", "Kernel        : "},
+    {"base",			1, "zz", "Base          : "},
+    {"etc",			1, "zz", "System (/etc) : "},
+    {"comp",			1, "zz", "Compiler      : "},
+    {"games",			1, "zz", "Games         : "},
+    {"man",			1, "zz", "Manuals       : "},
+    {"misc",			1, "zz", "Miscellaneous : "},
+    {"text",			1, "zz", "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, "zz", "X11 clients   : "},
+    {"xfont",			1, "zz", "X11 fonts     : "},
+    {"xserver",			1, "zz", "X11 servers   : "},
+    {"xcontrib",		1, "zz", "X11 contrib   : "},
+    {"xcomp",			1, "zz", "X programming : "},
+    {"xmisc",			1, "zz", "X11 Misc.     : "},
 #endif
     {NULL, 0, NULL, NULL }
 }


-- 
Julio M. Merino Vidal <jmmv@menta.net>
The NetBSD Project - http://www.NetBSD.org/