[src/netbsd-1-5]: src/distrib/utils/sysinst/arch/i386 Pullup 1.45 [fvdl]:

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

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

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

diffstat:

 distrib/utils/sysinst/arch/i386/md.c |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (28 lines):

diff -r 6abe8ca09bfd -r cf1d57e67a2e distrib/utils/sysinst/arch/i386/md.c
--- a/distrib/utils/sysinst/arch/i386/md.c      Fri Oct 20 17:29:13 2000 +0000
+++ b/distrib/utils/sysinst/arch/i386/md.c      Fri Oct 20 17:32:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.36.4.2 2000/10/18 17:51:21 tv Exp $ */
+/*     $NetBSD: md.c,v 1.36.4.3 2000/10/20 17:32:32 tv Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -647,14 +647,10 @@
        char *bootmodel;
 
        bootmodel = get_bootmodel();
-       if (strcmp(bootmodel, "tiny") == 0 || strcmp(bootmodel, "laptop")
-           == 0) {
-               /*
-                * XXX assumes the kernset is the first in the array.
-                */
-               snprintf(kernstr, sizeof kernstr, "kern-%s", bootmodel);
-               dist_list[0].name = &kernstr[0];
-       }
+       if (strcmp(bootmodel, "laptop") == 0)
+               dist_list[0] = special_kernel_list[0];
+       else if (strcmp(bootmodel, "tiny") == 0)
+               dist_list[0] = special_kernel_list[1];
 }
 
 /*