From 1c6ecba9bccd5cc434db0391bba06bbd357c2087 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Wed, 25 Mar 2009 03:42:41 +0000
Subject: [PATCH] don't ignore "fsck -f" when given with "-p" on a wapbl
 filesystem. ie, "fsck -fp" actually forces the check in preen mode now.

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

diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 3690d06e9c22..d2d8b355749e 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -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 @@ setup(const char *dev, const char *origdev)
 		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);