Module Name: src
Committed By: jakllsch
Date: Thu Jan 6 16:30:40 UTC 2011
Modified Files:
src/sbin/gpt: add.c gpt.c show.c
Log Message:
UFS is called FFS in the NetBSD case. Display as such and accept as input.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/gpt/add.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.5 -r1.6 src/sbin/gpt/show.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/gpt/add.c
diff -u src/sbin/gpt/add.c:1.8 src/sbin/gpt/add.c:1.9
--- src/sbin/gpt/add.c:1.8 Sat Feb 7 18:12:22 2009
+++ src/sbin/gpt/add.c Thu Jan 6 16:30:40 2011
@@ -29,7 +29,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: add.c,v 1.8 2009/02/07 18:12:22 uebayasi Exp $");
+__RCSID("$NetBSD: add.c,v 1.9 2011/01/06 16:30:40 jakllsch Exp $");
#endif
#include <sys/types.h>
@@ -213,10 +213,10 @@
if (argc == optind)
usage_add();
- /* Create UFS partitions by default. */
+ /* Create NetBSD FFS partitions by default. */
if (uuid_is_nil(&type, NULL)) {
- uuid_t ufs = GPT_ENT_TYPE_NETBSD_FFS;
- type = ufs;
+ uuid_t nb_ffs = GPT_ENT_TYPE_NETBSD_FFS;
+ type = nb_ffs;
}
while (optind < argc) {
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.13 src/sbin/gpt/gpt.c:1.14
--- src/sbin/gpt/gpt.c:1.13 Thu Jan 6 01:08:48 2011
+++ src/sbin/gpt/gpt.c Thu Jan 6 16:30:40 2011
@@ -31,7 +31,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.13 2011/01/06 01:08:48 jakllsch Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.14 2011/01/06 16:30:40 jakllsch Exp $");
#endif
#include <sys/param.h>
@@ -306,6 +306,13 @@
return (0);
}
break;
+ case 'f':
+ if (strcmp(s, "ffs") == 0) {
+ uuid_t nb_ffs = GPT_ENT_TYPE_NETBSD_FFS;
+ *uuid = nb_ffs;
+ return (0);
+ }
+ break;
case 'h':
if (strcmp(s, "hfs") == 0) {
uuid_t hfs = GPT_ENT_TYPE_APPLE_HFS;
Index: src/sbin/gpt/show.c
diff -u src/sbin/gpt/show.c:1.5 src/sbin/gpt/show.c:1.6
--- src/sbin/gpt/show.c:1.5 Sun Feb 24 18:38:10 2008
+++ src/sbin/gpt/show.c Thu Jan 6 16:30:40 2011
@@ -29,7 +29,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: show.c,v 1.5 2008/02/24 18:38:10 christos Exp $");
+__RCSID("$NetBSD: show.c,v 1.6 2011/01/06 16:30:40 jakllsch Exp $");
#endif
#include <sys/types.h>
@@ -72,7 +72,7 @@
static uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS;
static uuid_t vinum = GPT_ENT_TYPE_FREEBSD_VINUM;
static uuid_t nb_swap = GPT_ENT_TYPE_NETBSD_SWAP;
- static uuid_t nb_ufs = GPT_ENT_TYPE_NETBSD_FFS;
+ static uuid_t nb_ffs = GPT_ENT_TYPE_NETBSD_FFS;
static uuid_t nb_lfs = GPT_ENT_TYPE_NETBSD_LFS;
static uuid_t nb_raid = GPT_ENT_TYPE_NETBSD_RAIDFRAME;
static uuid_t nb_ccd = GPT_ENT_TYPE_NETBSD_CCD;
@@ -89,8 +89,8 @@
return ("BIOS Boot");
if (uuid_equal(t, &nb_swap, NULL))
return ("NetBSD swap");
- if (uuid_equal(t, &nb_ufs, NULL))
- return ("NetBSD UFS/UFS2");
+ if (uuid_equal(t, &nb_ffs, NULL))
+ return ("NetBSD FFSv1/FFSv2");
if (uuid_equal(t, &nb_lfs, NULL))
return ("NetBSD LFS");
if (uuid_equal(t, &nb_raid, NULL))
