[src/netbsd-9]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/c7680a9d611d
branches:  netbsd-9
changeset: 458257:c7680a9d611d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Aug 28 10:01:57 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #125):
        usr.sbin/sysinst/mbr.c: revision 1.21
When requesting no special FS sub type, default to FAT32 with LBA.
Fixes one part of PR 54490.

diffstat:

 usr.sbin/sysinst/mbr.c |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r 923dce644ea5 -r c7680a9d611d usr.sbin/sysinst/mbr.c
--- a/usr.sbin/sysinst/mbr.c    Wed Aug 28 10:00:53 2019 +0000
+++ b/usr.sbin/sysinst/mbr.c    Wed Aug 28 10:01:57 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.19.2.1 2019/08/18 13:21:40 msaitoh Exp $ */
+/*     $NetBSD: mbr.c,v 1.19.2.2 2019/08/28 10:01:57 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1047,6 +1047,9 @@
        case FS_EX2FS:
                return &mbr_gen_type_desc[MBR_PTYPE_LNXEXT2].gen;
        case FS_MSDOS:
+               if (sub_type == 0)
+                       sub_type = MBR_PTYPE_FAT32L;
+
                switch (sub_type) {
                case MBR_PTYPE_FAT12:
                case MBR_PTYPE_FAT16S: