svn commit: r335559 - head/sbin/fsck_msdosfs

[Xin LI]

Author: delphij
Date: Fri Jun 22 16:18:19 2018
New Revision: 335559
URL: https://svnweb.freebsd.org/changeset/base/335559

Log:
  Don't bail out when we find primary and secondary bootblocks miscompare.
  We do not have code to fix this situation, and the mismatch does not
  prevent the kernel driver from consuming the file system, and some factory
  formatted SD cards seem to have a garbage backup block.
  
  This makes the code match to its comments (replacing pfatal with pwarn).
  
  Inspired by:	NetBSD r1.13
  Inspired by:	https://android.googlesource.com/platform/external/fsck_msdos/+/b47b16353f3db228711dded9f7c975b820059ddc
  MFC after:	2 weeks

Modified:
  head/sbin/fsck_msdosfs/boot.c

Modified: head/sbin/fsck_msdosfs/boot.c
==============================================================================
--- head/sbin/fsck_msdosfs/boot.c	Fri Jun 22 15:00:00 2018	(r335558)
+++ head/sbin/fsck_msdosfs/boot.c	Fri Jun 22 16:18:19 2018	(r335559)
@@ -167,11 +167,11 @@ readboot(int dosfs, struct bootblock *boot)
 			 * requirement is suspect.  For now, just
 			 * print out useful information and continue.
 			 */
-			pfatal("backup (block %d) mismatch with primary bootblock:\n",
+			pwarn("backup (block %d) mismatch with primary bootblock:\n",
 			        boot->bpbBackup);
 			for (i = 11; i < 11 + 90; i++) {
 				if (block[i] != backup[i])
-					pfatal("\ti=%d\tprimary 0x%02x\tbackup 0x%02x\n",
+					pwarn("\ti=%d\tprimary 0x%02x\tbackup 0x%02x\n",
 					       i, block[i], backup[i]);
 			}
 		}