Module Name: src
Committed By: lukem
Date: Thu May 7 06:56:56 UTC 2009
Modified Files:
src/sbin/newfs: mkfs.c newfs.c
Log Message:
Consistently use FFSv1 or FFSv2
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sbin/newfs/mkfs.c
cvs rdiff -u -r1.104 -r1.105 src/sbin/newfs/newfs.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/newfs/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.105 src/sbin/newfs/mkfs.c:1.106
--- src/sbin/newfs/mkfs.c:1.105 Sat Apr 11 07:20:09 2009
+++ src/sbin/newfs/mkfs.c Thu May 7 06:56:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.105 2009/04/11 07:20:09 lukem Exp $ */
+/* $NetBSD: mkfs.c,v 1.106 2009/05/07 06:56:56 lukem Exp $ */
/*
* Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
#if 0
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#else
-__RCSID("$NetBSD: mkfs.c,v 1.105 2009/04/11 07:20:09 lukem Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.106 2009/05/07 06:56:56 lukem Exp $");
#endif
#endif /* not lint */
@@ -289,7 +289,7 @@
if (Oflag <= 1) {
if ((uint64_t)sblock.fs_size >= 1ull << 31) {
printf("Too many fragments (0x%" PRIx64
- ") for a UFS1 filesystem\n", sblock.fs_size);
+ ") for a FFSv1 filesystem\n", sblock.fs_size);
exit(22);
}
sblock.fs_magic = FS_UFS1_MAGIC;
Index: src/sbin/newfs/newfs.c
diff -u src/sbin/newfs/newfs.c:1.104 src/sbin/newfs/newfs.c:1.105
--- src/sbin/newfs/newfs.c:1.104 Sat Apr 11 07:20:09 2009
+++ src/sbin/newfs/newfs.c Thu May 7 06:56:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: newfs.c,v 1.104 2009/04/11 07:20:09 lukem Exp $ */
+/* $NetBSD: newfs.c,v 1.105 2009/05/07 06:56:56 lukem Exp $ */
/*
* Copyright (c) 1983, 1989, 1993, 1994
@@ -78,7 +78,7 @@
#if 0
static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: newfs.c,v 1.104 2009/04/11 07:20:09 lukem Exp $");
+__RCSID("$NetBSD: newfs.c,v 1.105 2009/05/07 06:56:56 lukem Exp $");
#endif
#endif /* not lint */
@@ -797,7 +797,7 @@
{ NEWFS, "-I \t\tdo not check that the file system type is '4.2BSD'" },
{ BOTH, "-N \t\tdo not create file system, just print out "
"parameters" },
- { NEWFS, "-O N\t\tfilesystem format: 0 ==> 4.3BSD, 1 ==> FFS, 2 ==> UFS2" },
+ { NEWFS, "-O N\t\tfilesystem format: 0 ==> 4.3BSD, 1 ==> FFSv1, 2 ==> FFSv2" },
{ NEWFS, "-S secsize\tsector size" },
#ifdef COMPAT
{ NEWFS, "-T disktype\tdisk type" },
