[src/trunk]: src/sbin/fsck_ffs Restore changes from 1.86 and 1.87 after commi...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4ffbe69c0a89
branches:  trunk
changeset: 747690:4ffbe69c0a89
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Sep 27 17:13:37 2009 +0000

description:
Restore changes from 1.86 and 1.87 after commit of 1.88.

diffstat:

 sbin/fsck_ffs/setup.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 622aff96d5df -r 4ffbe69c0a89 sbin/fsck_ffs/setup.c
--- a/sbin/fsck_ffs/setup.c     Sun Sep 27 16:44:40 2009 +0000
+++ b/sbin/fsck_ffs/setup.c     Sun Sep 27 17:13:37 2009 +0000
@@ -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");