Module Name: src
Committed By: mrg
Date: Wed Mar 25 03:42:41 UTC 2009
Modified Files:
src/sbin/fsck_ffs: setup.c
Log Message:
don't ignore "fsck -f" when given with "-p" on a wapbl filesystem.
ie, "fsck -fp" actually forces the check in preen mode now.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sbin/fsck_ffs/setup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/setup.c
diff -u src/sbin/fsck_ffs/setup.c:1.85 src/sbin/fsck_ffs/setup.c:1.86
--- src/sbin/fsck_ffs/setup.c:1.85 Wed Feb 25 13:52:18 2009
+++ src/sbin/fsck_ffs/setup.c Wed Mar 25 03:42:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.85 2009/02/25 13:52:18 christos Exp $ */
+/* $NetBSD: setup.c,v 1.86 2009/03/25 03:42:41 mrg Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95";
#else
-__RCSID("$NetBSD: setup.c,v 1.85 2009/02/25 13:52:18 christos Exp $");
+__RCSID("$NetBSD: setup.c,v 1.86 2009/03/25 03:42:41 mrg Exp $");
#endif
#endif /* not lint */
@@ -174,7 +174,7 @@
pwarn("USING ALTERNATE SUPERBLOCK AT %d\n", bflag);
}
if (sblock->fs_flags & FS_DOWAPBL) {
- if (preen) {
+ if (preen && !skipclean) {
if (!quiet)
pwarn("file system is journaled; not checking\n");
return (-1);
