Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/sysinst/arch/evbarm Boot partition as FAT32 doesn't...



details:   https://anonhg.NetBSD.org/src/rev/23302567644f
branches:  trunk
changeset: 336704:23302567644f
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Mar 12 11:32:16 2015 +0000

description:
Boot partition as FAT32 doesn't really make sense, so don't force
the MBR to lie and allow FAT16 too.

diffstat:

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

diffs (29 lines):

diff -r d03c6df66a90 -r 23302567644f usr.sbin/sysinst/arch/evbarm/md.c
--- a/usr.sbin/sysinst/arch/evbarm/md.c Thu Mar 12 08:01:45 2015 +0000
+++ b/usr.sbin/sysinst/arch/evbarm/md.c Thu Mar 12 11:32:16 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */
+/*     $NetBSD: md.c,v 1.3 2015/03/12 11:32:16 joerg Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -266,7 +266,8 @@
                for (ext = mbri; ext; ext = ext->extended) {
                        part = ext->mbr.mbr_parts;
                        for (i=0, hasboot=0; i < MBR_PART_COUNT; part++, i++) {
-                               if (part->mbrp_type != MBR_PTYPE_FAT32L)
+                               if (part->mbrp_type != MBR_PTYPE_FAT16L &&
+                                   part->mbrp_type != MBR_PTYPE_FAT32L)
                                        continue;
                                hasboot = 1;
                                break;
@@ -300,7 +301,8 @@
        /* raspi code */
        if (boardtype == BOARD_TYPE_RPI) {
                part = &mbrs->mbr_parts[0];
-               if (part[0].mbrp_type != MBR_PTYPE_FAT32L) {
+               if (part[0].mbrp_type != MBR_PTYPE_FAT16L &&
+                   part[0].mbrp_type != MBR_PTYPE_FAT32L) {
                        /* It's hopelessly corrupt, punt for now */
                        msg_display(MSG_nomsdospart);
                        process_menu(MENU_ok, NULL);



Home | Main Index | Thread Index | Old Index