Module Name: src
Committed By: bouyer
Date: Sun Sep 27 17:13:37 UTC 2009
Modified Files:
src/sbin/fsck_ffs: setup.c
Log Message:
Restore changes from 1.86 and 1.87 after commit of 1.88.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 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.88 src/sbin/fsck_ffs/setup.c:1.89
--- src/sbin/fsck_ffs/setup.c:1.88 Sun Sep 13 14:25:28 2009
+++ src/sbin/fsck_ffs/setup.c Sun Sep 27 17:13:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.88 2009/09/13 14:25:28 bouyer Exp $ */
+/* $NetBSD: setup.c,v 1.89 2009/09/27 17:13:37 bouyer 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.88 2009/09/13 14:25:28 bouyer Exp $");
+__RCSID("$NetBSD: setup.c,v 1.89 2009/09/27 17:13:37 bouyer Exp $");
#endif
#endif /* not lint */
@@ -181,7 +181,7 @@
doskipclean = 0;
}
if (sblock->fs_flags & FS_DOWAPBL) {
- if (preen) {
+ if (preen && skipclean) {
if (!quiet)
pwarn("file system is journaled; "
"not checking\n");
