Merge pull request #422 from az143/fstab-nofail

This commit is contained in:
Joachim Wiberg authored and GitHub committed 2024-12-20 02:18:09 +01:00
commit 74f0fcfccd
1 file changed
+7 -2
+7 -2
View File
@@ -272,8 +272,13 @@ static int fsck(int pass)
* errors were corrected but that the boot may proceed. * errors were corrected but that the boot may proceed.
*/ */
if (fsck_rc > 1) { if (fsck_rc > 1) {
logit(LOG_CONSOLE | LOG_ALERT, "Failed fsck %s, attempting sulogin ...", dev); if (hasmntopt(mnt,"nofail")) {
sulogin(1); logit(LOG_CONSOLE | LOG_WARNING, "Ignoring failed fsck %s because of nofail option", dev);
fsck_rc = 0;
} else {
logit(LOG_CONSOLE | LOG_ALERT, "Failed fsck %s, attempting sulogin ...", dev);
sulogin(1);
}
} }
rc += fsck_rc; rc += fsck_rc;
} }