[src/trunk]: src/usr.sbin/dumpfs Fix PR kern/24809 properly...

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

details:   https://anonhg.NetBSD.org/src/rev/9ce6f48e0f72
branches:  trunk
changeset: 559632:9ce6f48e0f72
user:      dsl <dsl%NetBSD.org@localhost>
date:      Sun Mar 21 12:37:48 2004 +0000

description:
Fix PR kern/24809 properly...

diffstat:

 usr.sbin/dumpfs/dumpfs.c |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 0f9616dadd49 -r 9ce6f48e0f72 usr.sbin/dumpfs/dumpfs.c
--- a/usr.sbin/dumpfs/dumpfs.c  Sun Mar 21 12:30:51 2004 +0000
+++ b/usr.sbin/dumpfs/dumpfs.c  Sun Mar 21 12:37:48 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dumpfs.c,v 1.44 2004/03/20 14:09:44 dsl Exp $  */
+/*     $NetBSD: dumpfs.c,v 1.45 2004/03/21 12:37:48 dsl Exp $  */
 
 /*
  * Copyright (c) 1983, 1992, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)dumpfs.c   8.5 (Berkeley) 4/29/95";
 #else
-__RCSID("$NetBSD: dumpfs.c,v 1.44 2004/03/20 14:09:44 dsl Exp $");
+__RCSID("$NetBSD: dumpfs.c,v 1.45 2004/03/21 12:37:48 dsl Exp $");
 #endif
 #endif /* not lint */
 
@@ -191,9 +191,15 @@
                        continue;
                }
                fix_superblock(&afs, opostblsave);
-               if (sblock_try[i] != afs.fs_sblockloc)
-                       /* This must be an alternate superblock */
-                       continue;
+               if (afs.fs_old_flags & FS_FLAGS_UPDATED) {
+                       if (sblock_try[i] != afs.fs_sblockloc)
+                               /* This must be an alternate superblock */
+                               continue;
+               } else {
+                       if (!is_ufs2 && sblock_try[i] == SBLOCK_UFS2)
+                               /* This might be an alternate superblock */
+                               continue;
+               }
                break;
        }