From 7b402ff9df8dc6c8ee97fb72842a21af57000ce4 Mon Sep 17 00:00:00 2001
From: fvdl <fvdl@NetBSD.org>
Date: Mon, 14 Apr 2003 18:50:52 +0000
Subject: [PATCH] If an alternate superblock is used, update the standard one
 correctly.

---
 sbin/fsck_ffs/utilities.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 61678d3a81c9..10a3017acf0c 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: utilities.c,v 1.38 2003/04/13 10:22:40 yamt Exp $	*/
+/*	$NetBSD: utilities.c,v 1.39 2003/04/14 18:50:52 fvdl Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #else
-__RCSID("$NetBSD: utilities.c,v 1.38 2003/04/13 10:22:40 yamt Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.39 2003/04/14 18:50:52 fvdl Exp $");
 #endif
 #endif /* not lint */
 
@@ -279,12 +279,12 @@ ckfini()
 		return;
 	}
 	flush(fswritefd, &sblk);
-	if (havesb && is_ufs2 && sblk.b_bno !=
-	    sblock->fs_sblockloc / dev_bsize &&
+	if (havesb && bflag != 0 &&
 	    !preen && reply("UPDATE STANDARD SUPERBLOCK")) {
-		printf("sblk.b_bno %lld sblockloc %lld\n",
-		    (long long)sblk.b_bno, (long long)sblock->fs_sblockloc);
-		sblk.b_bno = sblock->fs_sblockloc / dev_bsize;
+		if (!is_ufs2 && (sblock->fs_old_flags & FS_FLAGS_UPDATED) == 0)
+			sblk.b_bno = SBLOCK_UFS1 / dev_bsize;
+		else
+			sblk.b_bno = sblock->fs_sblockloc / dev_bsize;
 		sbdirty();
 		flush(fswritefd, &sblk);
 	}