[src/netbsd-1-6]: src/distrib/utils/sysinst Pull up revision 1.44 (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/9c326d04b30d
branches:  netbsd-1-6
changeset: 528307:9c326d04b30d
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Jun 30 05:54:35 2002 +0000

description:
Pull up revision 1.44 (requested by scottr in ticket #407):
Correct fsck_num() implementation; return the fs_passno value as defined
in fstab(5). Noticed by Frederick Bruckman.

diffstat:

 distrib/utils/sysinst/disks.c |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (27 lines):

diff -r f104cb4fe82b -r 9c326d04b30d distrib/utils/sysinst/disks.c
--- a/distrib/utils/sysinst/disks.c     Sun Jun 30 05:48:05 2002 +0000
+++ b/distrib/utils/sysinst/disks.c     Sun Jun 30 05:54:35 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.41 2001/01/14 23:45:17 mrg Exp $ */
+/*     $NetBSD: disks.c,v 1.41.2.1 2002/06/30 05:54:35 lukem Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -358,15 +358,11 @@
        return 0;
 }
 
+/* Return the appropriate fs_passno field, as specified by fstab(5) */
 static int
 fsck_num(const char *mp)
 {
-       static int num = 1;
-
-       if (strcmp(mp, "/"))
-               return 1;
-
-       return (++num);
+       return (strcmp(mp, "/") == 0) ? 1 : 2;
 }