Module Name: src
Committed By: mlelstv
Date: Sat Dec 6 12:24:22 UTC 2014
Modified Files:
src/sbin/gpt: gpt.8 gpt_uuid.c
Log Message:
Add some more common partition types.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.9 -r1.10 src/sbin/gpt/gpt_uuid.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/gpt.8
diff -u src/sbin/gpt/gpt.8:1.34 src/sbin/gpt/gpt.8:1.35
--- src/sbin/gpt/gpt.8:1.34 Sat Oct 4 07:15:54 2014
+++ src/sbin/gpt/gpt.8 Sat Dec 6 12:24:22 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: gpt.8,v 1.34 2014/10/04 07:15:54 wiz Exp $
+.\" $NetBSD: gpt.8,v 1.35 2014/12/06 12:24:22 mlelstv Exp $
.\"
.\" Copyright (c) 2002 Marcel Moolenaar
.\" All rights reserved.
@@ -158,11 +158,50 @@ option allows the user to specify the pa
The type is given as an UUID, but
.Nm
accepts
-.Cm efi , swap , ufs , hfs , linux ,
-.Cm raid , lfs , ccd , cgd , bios ,
-.Cm ffs ,
-and
-.Cm windows
+.Bl -tag -width "windows-reserved" -compact -offset indent
+.It Cm apple
+Apple HFS
+.It Cm apple-ufs
+Apple UFS
+.It Cm bios
+BIOS Boot
+.It Cm efi
+EFI System
+.It Cm fbsd-legacy
+FreeBSD legacy
+.It Cm fbsd-swap
+FreeBSD swap
+.It Cm fbsd-ufs
+FreeBSD UFS/UFS2
+.It Cm fbsd-vinum
+FreeBSD vinum
+.It Cm fbsd-zfs
+FreeBSD ZFS
+.It Cm linux-data
+Linux data
+.It Cm linux-raid
+Linux RAID
+.It Cm linux-swap
+Linux swap
+.It Cm linux-lvm
+Linux LVM
+.It Cm windows
+Windows basic data
+.It Cm windows-reserved
+Windows reserved
+.It Cm ccd
+NetBSD ccd component
+.It Cm cgd
+NetBSD Cryptographic Disk
+.It Cm ffs
+NetBSD FFSv1/FFSv2
+.It Cm lfs
+NetBSD LFS
+.It Cm raid
+NetBSD RAIDFrame component
+.It Cm swap
+NetBSD swap
+.El
as aliases for the most commonly used partition types.
.\" ==== backup ====
.It Nm Ic backup Ar device ...
Index: src/sbin/gpt/gpt_uuid.c
diff -u src/sbin/gpt/gpt_uuid.c:1.9 src/sbin/gpt/gpt_uuid.c:1.10
--- src/sbin/gpt/gpt_uuid.c:1.9 Sat Oct 4 11:23:35 2014
+++ src/sbin/gpt/gpt_uuid.c Sat Dec 6 12:24:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt_uuid.c,v 1.9 2014/10/04 11:23:35 riastradh Exp $ */
+/* $NetBSD: gpt_uuid.c,v 1.10 2014/12/06 12:24:22 mlelstv Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifdef __RCSID
-__RCSID("$NetBSD: gpt_uuid.c,v 1.9 2014/10/04 11:23:35 riastradh Exp $");
+__RCSID("$NetBSD: gpt_uuid.c,v 1.10 2014/12/06 12:24:22 mlelstv Exp $");
#endif
#include <err.h>
@@ -65,6 +65,7 @@ static const struct {
const char *d;
} gpt_nv[] = {
{ GPT_ENT_TYPE_APPLE_HFS, "apple", "Apple HFS" },
+ { GPT_ENT_TYPE_APPLE_UFS, "apple-ufs", "Apple UFS" },
{ GPT_ENT_TYPE_BIOS, "bios", "BIOS Boot" },
{ GPT_ENT_TYPE_EFI, "efi", "EFI System" },
{ GPT_ENT_TYPE_FREEBSD, "fbsd-legacy", "FreeBSD legacy" },
@@ -73,7 +74,9 @@ static const struct {
{ GPT_ENT_TYPE_FREEBSD_VINUM, "fbsd-vinum", "FreeBSD vinum" },
{ GPT_ENT_TYPE_FREEBSD_ZFS, "fbsd-zfs", "FreeBSD ZFS" },
{ GPT_ENT_TYPE_LINUX_DATA, "linux-data", "Linux data" },
+ { GPT_ENT_TYPE_LINUX_RAID, "linux-raid", "Linux RAID" },
{ GPT_ENT_TYPE_LINUX_SWAP, "linux-swap", "Linux swap" },
+ { GPT_ENT_TYPE_LINUX_LVM, "linux-lvm", "Linux LVM" },
{ GPT_ENT_TYPE_MS_BASIC_DATA, "windows", "Windows basic data" },
{ GPT_ENT_TYPE_MS_RESERVED, "windows-reserved", "Windows reserved" },
{ GPT_ENT_TYPE_NETBSD_CCD, "ccd", "NetBSD ccd component" },
