Date: Mon, 30 Apr 2018 05:57:56 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333098 - head/sbin/fsck_msdosfs Message-ID: <201804300557.w3U5vucZ070029@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon Apr 30 05:57:55 2018 New Revision: 333098 URL: https://svnweb.freebsd.org/changeset/base/333098 Log: 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 MFC after: 2 weeks Modified: head/sbin/fsck_msdosfs/check.c Modified: head/sbin/fsck_msdosfs/check.c ============================================================================== --- head/sbin/fsck_msdosfs/check.c Mon Apr 30 04:02:48 2018 (r333097) +++ head/sbin/fsck_msdosfs/check.c Mon Apr 30 05:57:55 2018 (r333098) @@ -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?201804300557.w3U5vucZ070029>