[src/netbsd-1-6]: src/distrib/utils/sysinst/arch/i386 Pull up revision 1.60 (...

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

details:   https://anonhg.NetBSD.org/src/rev/ecd13420e7e7
branches:  netbsd-1-6
changeset: 527904:ecd13420e7e7
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 14 17:12:51 2002 +0000

description:
Pull up revision 1.60 (requested by lukem in ticket #272):
Setup default mbr_bootsel labels for used partitions, since the previous
default was for them to be empty, and that meant that they wouldn't get shown
at boot time.   Fix from Tyler Retzlaff <rtr%wasabisystems.com@localhost>

diffstat:

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

diffs (25 lines):

diff -r 4180bbc7e8a9 -r ecd13420e7e7 distrib/utils/sysinst/arch/i386/md.c
--- a/distrib/utils/sysinst/arch/i386/md.c      Fri Jun 14 17:12:39 2002 +0000
+++ b/distrib/utils/sysinst/arch/i386/md.c      Fri Jun 14 17:12:51 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.58.2.1 2002/05/29 20:46:16 tv Exp $ */
+/*     $NetBSD: md.c,v 1.58.2.2 2002/06/14 17:12:51 lukem Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -594,6 +594,15 @@
        mbs = (struct mbr_bootsel *)&mbr[MBR_BOOTSELOFF];
        mbs->flags = BFL_SELACTIVE;
 
+       /* Setup default labels for partitions, since if not done by user */
+       /* they don't get set and and bootselector doesn't 'appear' when  */
+       /* it's loaded.                                                   */
+       for (i = 0; i < NMBRPART; i++) {
+               if (parts[i].mbrp_typ != 0 && mbs->nametab[i][0] == '\0')
+                       snprintf(mbs->nametab[i], sizeof(mbs->nametab[0]),
+                           "entry %d", i+1);
+       }
+
        process_menu(MENU_configbootsel);
 
        for (i = 0; i < NMBRPART; i++) {