Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jun 2018 05:38:22 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r334605 - stable/11/sbin/fsck_msdosfs
Message-ID:  <201806040538.w545cM3O080467@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Mon Jun  4 05:38:22 2018
New Revision: 334605
URL: https://svnweb.freebsd.org/changeset/base/334605

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/11/sbin/fsck_msdosfs/check.c
Directory Properties:
  stable/11/   (props changed)

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806040538.w545cM3O080467>