[src/trunk]: src/distrib/utils/sysinst/arch Setup default mbr_bootsel labels ...

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

details:   https://anonhg.NetBSD.org/src/rev/050f7d37c92d
branches:  trunk
changeset: 532749:050f7d37c92d
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 14 03:29:28 2002 +0000

description:
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/hpcmips/md.c |  11 ++++++++++-
 distrib/utils/sysinst/arch/i386/md.c    |  11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r b607b2c08c85 -r 050f7d37c92d distrib/utils/sysinst/arch/hpcmips/md.c
--- a/distrib/utils/sysinst/arch/hpcmips/md.c   Fri Jun 14 03:11:24 2002 +0000
+++ b/distrib/utils/sysinst/arch/hpcmips/md.c   Fri Jun 14 03:29:28 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.12 2001/01/14 02:38:18 mrg Exp $ */
+/*     $NetBSD: md.c,v 1.13 2002/06/14 03:29:28 lukem Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -625,6 +625,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++) {
diff -r b607b2c08c85 -r 050f7d37c92d distrib/utils/sysinst/arch/i386/md.c
--- a/distrib/utils/sysinst/arch/i386/md.c      Fri Jun 14 03:11:24 2002 +0000
+++ b/distrib/utils/sysinst/arch/i386/md.c      Fri Jun 14 03:29:28 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.59 2002/05/29 20:36:40 tv Exp $ */
+/*     $NetBSD: md.c,v 1.60 2002/06/14 03:29:28 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++) {