From owner-svn-src-stable@freebsd.org  Mon Jun  4 05:47:16 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57A35FF57C9;
 Mon,  4 Jun 2018 05:47:16 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E2AF773C39;
 Mon,  4 Jun 2018 05:47:15 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C2E5B12A0;
 Mon,  4 Jun 2018 05:47:15 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w545lFoo085552;
 Mon, 4 Jun 2018 05:47:15 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w545lFp2085551;
 Mon, 4 Jun 2018 05:47:15 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201806040547.w545lFp2085551@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 4 Jun 2018 05:47:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r334606 - stable/10/sbin/fsck_msdosfs
X-SVN-Group: stable-10
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: stable/10/sbin/fsck_msdosfs
X-SVN-Commit-Revision: 334606
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jun 2018 05:47:16 -0000

Author: delphij
Date: Mon Jun  4 05:47:15 2018
New Revision: 334606
URL: https://svnweb.freebsd.org/changeset/base/334606

Log:
  MFC r333098:
  
  Don't bail out from the check if readboot() returns !FSFATAL.
  
  This can happen when the fsinfo signature is invalid, and the
  user have choose to fix it, in which case the code would return
  FSBOOTMOD (not FSOK but not FSFATAL either).
  
  All other (fatal) cases would return FSFATAL.
  
  Obtained from:	Android Open Source Project
  Obtained from:	https://android.googlesource.com/platform/external/fsck_msdos/+/d8775a29ea7eac2e5f1504dd21da3725b93b3036

Modified:
  stable/10/sbin/fsck_msdosfs/check.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/fsck_msdosfs/check.c
==============================================================================
--- stable/10/sbin/fsck_msdosfs/check.c	Mon Jun  4 05:38:22 2018	(r334605)
+++ stable/10/sbin/fsck_msdosfs/check.c	Mon Jun  4 05:47:15 2018	(r334606)
@@ -72,7 +72,7 @@ checkfilesys(const char *fname)
 		return 8;
 	}
 
-	if (readboot(dosfs, &boot) != FSOK) {
+	if (readboot(dosfs, &boot) == FSFATAL) {
 		close(dosfs);
 		printf("\n");
 		return 8;