From bc52bf44002bec5b1b272f1bbf3c005758564872 Mon Sep 17 00:00:00 2001
From: Artur Grabowski <art@cvs.openbsd.org>
Date: Fri, 2 Mar 2001 08:33:56 +0000
Subject: Make fsck aware of soft updates. We had this in the tree 1997, but it
 went away because it was too close to release. Ok: csapuntz@ (as a size note:
 It's really good to test fsck when you are torture testing the filesystems)

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

(limited to 'sbin/fsck_ffs/setup.c')

diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 482bcc7fdfa..75c04b77e7a 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setup.c,v 1.7 1999/08/17 09:13:14 millert Exp $	*/
+/*	$OpenBSD: setup.c,v 1.8 2001/03/02 08:33:55 art Exp $	*/
 /*	$NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.5 (Berkeley) 11/23/94";
 #else
-static char rcsid[] = "$OpenBSD: setup.c,v 1.7 1999/08/17 09:13:14 millert Exp $";
+static char rcsid[] = "$OpenBSD: setup.c,v 1.8 2001/03/02 08:33:55 art Exp $";
 #endif
 #endif /* not lint */
 
@@ -336,8 +336,10 @@ setup(dev)
 		    fsbtodb(&sblock, sblock.fs_csaddr + j * sblock.fs_frag),
 		    size) != 0 && !asked) {
 			pfatal("BAD SUMMARY INFORMATION");
-			if (reply("CONTINUE") == 0)
+			if (reply("CONTINUE") == 0) {
+				ckfini(0);
 				errexit("%s", "");
+			}
 			asked++;
 		}
 	}
@@ -382,6 +384,10 @@ setup(dev)
 		goto badsblabel;
 	}
 	bufinit();
+	if (sblock.fs_flags & FS_DOSOFTDEP)
+		usedsoftdep = 1;
+	else
+		usedsoftdep = 0;
 	return (1);
 
 badsblabel:
-- 
cgit v1.2.3