[src/netbsd-9]: src/usr.sbin/sysinst/arch/i386 Pull up the following revision...

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

details:   https://anonhg.NetBSD.org/src/rev/cc7ba877c63a
branches:  netbsd-9
changeset: 964183:cc7ba877c63a
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Wed Nov 04 13:31:23 2020 +0000

description:
Pull up the following revisions(s) (requested by martin in ticket #1120):
        usr.sbin/sysinst/arch/i386/md.c:        revision 1.33

Do not force bootselector MBR code for installs with only a single named
partition.

diffstat:

 usr.sbin/sysinst/arch/i386/md.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r b081aa34cfe6 -r cc7ba877c63a usr.sbin/sysinst/arch/i386/md.c
--- a/usr.sbin/sysinst/arch/i386/md.c   Wed Nov 04 13:27:40 2020 +0000
+++ b/usr.sbin/sysinst/arch/i386/md.c   Wed Nov 04 13:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.20.2.7 2020/10/15 19:36:51 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.20.2.8 2020/11/04 13:31:23 sborrill Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -573,12 +573,14 @@
        }
 
        /* Sort out the name of the mbr code we need */
-       if (names > 0 || fl & (NETBSD_NAMED | ACTIVE_NAMED)) {
+       if (names > 1 ||
+           (parts->num_part > 1 && (fl & (NETBSD_NAMED | ACTIVE_NAMED)))) {
                /* Need bootselect code */
                fl |= MBR_BS_ACTIVE;
                bootcode = fl & MBR_BS_EXTLBA ? _PATH_BOOTEXT : _PATH_BOOTSEL;
-       } else
+       } else {
                bootcode = _PATH_MBR;
+       }
 
        fl &=  MBR_BS_ACTIVE | MBR_BS_EXTLBA;