Module Name: src
Committed By: njoly
Date: Sun Feb 6 12:02:59 UTC 2011
Modified Files:
src/sbin/fsck_ffs: main.c
Log Message:
Do Skip device checks, which ends up parsing fstab, when working on a
filesystem image with -F option set.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sbin/fsck_ffs/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/main.c
diff -u src/sbin/fsck_ffs/main.c:1.76 src/sbin/fsck_ffs/main.c:1.77
--- src/sbin/fsck_ffs/main.c:1.76 Sun Apr 11 08:23:51 2010
+++ src/sbin/fsck_ffs/main.c Sun Feb 6 12:02:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.76 2010/04/11 08:23:51 hannken Exp $ */
+/* $NetBSD: main.c,v 1.77 2011/02/06 12:02:59 njoly Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#else
-__RCSID("$NetBSD: main.c,v 1.76 2010/04/11 08:23:51 hannken Exp $");
+__RCSID("$NetBSD: main.c,v 1.77 2011/02/06 12:02:59 njoly Exp $");
#endif
#endif /* not lint */
@@ -216,7 +216,12 @@
while (argc-- > 0) {
int nret;
- char *path = strdup(blockcheck(*argv));
+ char *path;
+
+ if (!forceimage)
+ path = strdup(blockcheck(*argv));
+ else
+ path = strdup(*argv);
if (path == NULL)
pfatal("Can't check %s\n", *argv);
