Module Name: src
Committed By: joerg
Date: Thu Mar 12 11:32:16 UTC 2015
Modified Files:
src/usr.sbin/sysinst/arch/evbarm: md.c
Log Message:
Boot partition as FAT32 doesn't really make sense, so don't force
the MBR to lie and allow FAT16 too.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbarm/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/evbarm/md.c
diff -u src/usr.sbin/sysinst/arch/evbarm/md.c:1.2 src/usr.sbin/sysinst/arch/evbarm/md.c:1.3
--- src/usr.sbin/sysinst/arch/evbarm/md.c:1.2 Sun Aug 3 16:09:39 2014
+++ src/usr.sbin/sysinst/arch/evbarm/md.c Thu Mar 12 11:32:16 2015
@@ -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 @@ md_check_mbr(mbr_info_t *mbri)
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 @@ md_mbr_use_wholedisk(mbr_info_t *mbri)
/* 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);
