Module Name: src
Committed By: christos
Date: Thu Jun 9 19:04:43 UTC 2016
Modified Files:
src/sbin/gpt: biosboot.c create.c gpt.8 migrate.c
Log Message:
Rename 'a' to set the active PMBR flag to 'A'
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sbin/gpt/biosboot.c
cvs rdiff -u -r1.21 -r1.22 src/sbin/gpt/create.c
cvs rdiff -u -r1.47 -r1.48 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.31 -r1.32 src/sbin/gpt/migrate.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/biosboot.c
diff -u src/sbin/gpt/biosboot.c:1.25 src/sbin/gpt/biosboot.c:1.26
--- src/sbin/gpt/biosboot.c:1.25 Thu Jun 9 11:12:54 2016
+++ src/sbin/gpt/biosboot.c Thu Jun 9 15:04:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: biosboot.c,v 1.25 2016/06/09 15:12:54 christos Exp $ */
+/* $NetBSD: biosboot.c,v 1.26 2016/06/09 19:04:43 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#ifdef __RCSID
-__RCSID("$NetBSD: biosboot.c,v 1.25 2016/06/09 15:12:54 christos Exp $");
+__RCSID("$NetBSD: biosboot.c,v 1.26 2016/06/09 19:04:43 christos Exp $");
#endif
#include <sys/stat.h>
@@ -68,7 +68,7 @@ __RCSID("$NetBSD: biosboot.c,v 1.25 2016
static int cmd_biosboot(gpt_t, int, char *[]);
static const char *biosboothelp[] = {
- "[-a] [-c bootcode] [-i index] [-L label]",
+ "[-A] [-c bootcode] [-i index] [-L label]",
#if notyet
"[-a alignment] [-b blocknr] [-i index] [-l label]",
"[-s size] [-t type]",
@@ -264,9 +264,9 @@ cmd_biosboot(gpt_t gpt, int argc, char *
uint8_t *label = NULL;
char *bootpath = NULL;
- while ((ch = getopt(argc, argv, "ac:i:L:")) != -1) {
+ while ((ch = getopt(argc, argv, "Ac:i:L:")) != -1) {
switch(ch) {
- case 'a':
+ case 'A':
active = 1;
break;
case 'c':
Index: src/sbin/gpt/create.c
diff -u src/sbin/gpt/create.c:1.21 src/sbin/gpt/create.c:1.22
--- src/sbin/gpt/create.c:1.21 Thu Jun 9 11:12:54 2016
+++ src/sbin/gpt/create.c Thu Jun 9 15:04:43 2016
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: create.c,v 1.21 2016/06/09 15:12:54 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.22 2016/06/09 19:04:43 christos Exp $");
#endif
#include <sys/types.h>
@@ -55,7 +55,7 @@ __RCSID("$NetBSD: create.c,v 1.21 2016/0
static int cmd_create(gpt_t, int, char *[]);
static const char *createhelp[] = {
- "[-afP] [-p partitions]",
+ "[-AfP] [-p partitions]",
};
struct gpt_cmd c_create = {
@@ -130,9 +130,9 @@ cmd_create(gpt_t gpt, int argc, char *ar
int primary_only = 0;
u_int parts = 128;
- while ((ch = getopt(argc, argv, "afPp:")) != -1) {
+ while ((ch = getopt(argc, argv, "AfPp:")) != -1) {
switch(ch) {
- case 'a':
+ case 'A':
active = 1;
break;
case 'f':
Index: src/sbin/gpt/gpt.8
diff -u src/sbin/gpt/gpt.8:1.47 src/sbin/gpt/gpt.8:1.48
--- src/sbin/gpt/gpt.8:1.47 Thu Jun 9 12:48:14 2016
+++ src/sbin/gpt/gpt.8 Thu Jun 9 15:04:43 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: gpt.8,v 1.47 2016/06/09 16:48:14 kre Exp $
+.\" $NetBSD: gpt.8,v 1.48 2016/06/09 19:04:43 christos Exp $
.\"
.\" Copyright (c) 2002 Marcel Moolenaar
.\" All rights reserved.
@@ -211,7 +211,7 @@ command.
The format is a plist.
It should not be modified.
.\" ==== biosboot ====
-.It Nm Ic biosboot Oo Fl a Oc Oo Fl c Ar bootcode Oc Oo Fl i Ar index Oc \
+.It Nm Ic biosboot Oo Fl A Oc Oo Fl c Ar bootcode Oc Oo Fl i Ar index Oc \
Oo Fl L Ar label Oc
The
.Ic biosboot
@@ -220,7 +220,7 @@ primary bootstrap program, used during
.Xr boot 8 .
.Pp
The
-.Fl a
+.Fl A
options sets the PMBR partition active.
.Pp
The
@@ -242,7 +242,7 @@ option selects the partition by label.
If there are multiple partitions with the same label, it will use the
first one found.
.\" ==== create ====
-.It Nm Ic create Oo Fl afP Oc Oo Fl p Ar partitions Oc
+.It Nm Ic create Oo Fl AfP Oc Oo Fl p Ar partitions Oc
The
.Ic create
command allows the user to create a new (empty) GPT.
@@ -256,7 +256,7 @@ option is specified, an existing MBR is
described by the MBR are lost.
.Pp
The
-.Fl a
+.Fl A
options sets the PMBR partition active.
.Pp
The
@@ -351,7 +351,7 @@ The
option is used to specify the label in the command line.
The label is assumed to be encoded in UTF-8.
.\" ==== migrate ====
-.It Nm Ic migrate Oo Fl afs Oc Oo Fl p Ar partitions Oc
+.It Nm Ic migrate Oo Fl Afs Oc Oo Fl p Ar partitions Oc
The
.Ic migrate
command allows the user to migrate an MBR-based disk partitioning into a
@@ -367,7 +367,7 @@ option will cause unknown partitions to
to be lost.
.Pp
The
-.Fl a
+.Fl A
options sets the PMBR partition active.
.Pp
The
Index: src/sbin/gpt/migrate.c
diff -u src/sbin/gpt/migrate.c:1.31 src/sbin/gpt/migrate.c:1.32
--- src/sbin/gpt/migrate.c:1.31 Thu Jun 9 11:12:54 2016
+++ src/sbin/gpt/migrate.c Thu Jun 9 15:04:43 2016
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.16 2005/09/01 02:42:52 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: migrate.c,v 1.31 2016/06/09 15:12:54 christos Exp $");
+__RCSID("$NetBSD: migrate.c,v 1.32 2016/06/09 19:04:43 christos Exp $");
#endif
#include <sys/types.h>
@@ -81,7 +81,7 @@ __RCSID("$NetBSD: migrate.c,v 1.31 2016/
static int cmd_migrate(gpt_t, int, char *[]);
static const char *migratehelp[] = {
- "[-afs] [-p partitions]",
+ "[-Afs] [-p partitions]",
};
struct gpt_cmd c_migrate = {
@@ -332,9 +332,9 @@ cmd_migrate(gpt_t gpt, int argc, char *a
u_int parts = 128;
/* Get the migrate options */
- while ((ch = getopt(argc, argv, "afp:s")) != -1) {
+ while ((ch = getopt(argc, argv, "Afp:s")) != -1) {
switch(ch) {
- case 'a':
+ case 'A':
active = 1;
break;
case 'f':
