[src/netbsd-1-5]: src/distrib/utils/sysinst/arch/i386 Pullup 1.23 plus patch ...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a13e9472095
branches:  netbsd-1-5
changeset: 489960:1a13e9472095
user:      tv <tv%NetBSD.org@localhost>
date:      Fri Oct 20 17:32:45 2000 +0000

description:
Pullup 1.23 plus patch [fvdl]:
Handle split sets for special kernel sets (-laptop and -tiny) correctly.

diffstat:

 distrib/utils/sysinst/arch/i386/md.h |  40 ++++++++++++++++++++---------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diffs (55 lines):

diff -r cf1d57e67a2e -r 1a13e9472095 distrib/utils/sysinst/arch/i386/md.h
--- a/distrib/utils/sysinst/arch/i386/md.h      Fri Oct 20 17:32:32 2000 +0000
+++ b/distrib/utils/sysinst/arch/i386/md.h      Fri Oct 20 17:32:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.17.4.2 2000/10/18 17:51:21 tv Exp $   */
+/*     $NetBSD: md.h,v 1.17.4.3 2000/10/20 17:32:45 tv Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -70,23 +70,29 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern",   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",   1, "aj", "Generic 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, "cr", "X11 servers   : "},
+    {"xcontrib",1, "aa", "X11 contrib   : "},
+    {"xcomp",  1, "ah", "X programming : "},
+    {NULL, 0, NULL, NULL }
+}
+#endif
+;
 
-    /* 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 }
+EXTERN distinfo special_kernel_list[]
+#ifdef MAIN
+= {
+    {"kern-laptop",    1, "ah", "Laptop Kernel : "},
+    {"kern-tiny",      1, "ac", "Small Kernel  : "},
 }
 #endif
 ;