readlabelfs()

diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 6f8e32d..1a2a0c9 100644 (file)
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: fsck.c,v 1.4 1996/12/04 10:25:57 deraadt Exp $        */
+/*     $OpenBSD: fsck.c,v 1.5 1996/12/23 07:44:59 downsj Exp $ */
 /*     $NetBSD: fsck.c,v 1.7 1996/10/03 20:06:30 christos Exp $        */
 
 /*
@@ -162,7 +162,7 @@ main(argc, argv)
                char *spec, *type;
 
                if (strncmp(*argv, "/dev/", 5) == 0 &&
-                   (type = readlabelfs(*argv))) {
+                   (type = readlabelfs(*argv, 0))) {
                        spec = *argv;
                } else if ((fs = getfsfile(*argv)) == NULL &&
                    (fs = getfsspec(*argv)) == NULL) {

diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 05a71de..8ad2028 100644 (file)
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mount.c,v 1.10 1996/12/09 13:25:26 deraadt Exp $      */
+/*     $OpenBSD: mount.c,v 1.11 1996/12/23 07:46:53 downsj Exp $       */
 /*     $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $   */
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount.c    8.19 (Berkeley) 4/19/94";
 #else
-static char rcsid[] = "$OpenBSD: mount.c,v 1.10 1996/12/09 13:25:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mount.c,v 1.11 1996/12/23 07:46:53 downsj Exp $";
 #endif
 #endif /* not lint */
 
@@ -236,7 +236,7 @@ main(argc, argv)
                        if (strpbrk(argv[0], ":@") != NULL)
                                vfstype = "nfs";
                        else {
-                               char *labelfs = readlabelfs(argv[0]);
+                               char *labelfs = readlabelfs(argv[0], 0);
                                if (labelfs != NULL)
                                        vfstype = labelfs;
                        }
@@ -588,7 +588,7 @@ disklabelcheck(fs)
 
        if (strcmp(fs->fs_vfstype, "nfs") != 0 ||
            strpbrk(fs->fs_spec, ":@") == NULL) {
-               labelfs = readlabelfs(fs->fs_spec);
+               labelfs = readlabelfs(fs->fs_spec, 1);
                if (labelfs == NULL ||
                    strcmp(labelfs, fs->fs_vfstype) == 0)
                        return (0);

diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 76c05ad..5558ce7 100644 (file)
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: newfs.c,v 1.8 1996/12/04 10:26:36 deraadt Exp $       */
+/*     $OpenBSD: newfs.c,v 1.9 1996/12/23 07:48:28 downsj Exp $        */
 /*     $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $       */
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)newfs.c    8.8 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: newfs.c,v 1.8 1996/12/04 10:26:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: newfs.c,v 1.9 1996/12/23 07:48:28 downsj Exp $";
 #endif
 #endif /* not lint */
 
@@ -353,7 +353,7 @@ main(argc, argv)
                char execname[MAXPATHLEN], name[MAXPATHLEN];
 
                if (fstype == NULL)
-                       fstype = readlabelfs(special);
+                       fstype = readlabelfs(special, 0);
                if (fstype == NULL || strcmp(fstype, "ffs")) {
                        snprintf(name, sizeof name, "newfs_%s", fstype);
                        saveargv[0] = name;