From c2aae21db5bd8f0cca596de856180fde36dcceb5 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Mon, 14 May 2012 17:27:55 -0500 Subject: [PATCH 1/3] Document `beadm rename` --- beadm.1 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/beadm.1 b/beadm.1 index d92ac2b..278733d 100644 --- a/beadm.1 +++ b/beadm.1 @@ -40,6 +40,10 @@ destroy .Ao Ar beName@snapshot Ac .Nm list +.Nm +rename +.Ao Ar origBeName Ac +.Ao Ar newBeName Ac .Sh DESCRIPTION The .Nm @@ -88,6 +92,13 @@ snapshot. .Pp Displays all boot environments. .Pp +.It Ic rename Ao Ar origBeName Ac Ao Ar newBeName Ac +.Pp +Renames the given +.Ar origBeName +to the given +.Ar newBeName +.Pp .El .Sh EXAMPLES .Bl -bullet From 46d9542b5ab3953a392ddc92bd8c24dd18f98194 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Mon, 14 May 2012 17:29:41 -0500 Subject: [PATCH 2/3] Fix wording for my author entry --- beadm.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beadm.1 b/beadm.1 index 278733d..af44ad4 100644 --- a/beadm.1 +++ b/beadm.1 @@ -145,4 +145,4 @@ originally appeared in Solaris. .Sh AUTHORS .An Slawomir Wojciech Wojtczak (vermaden) Aq vermaden@interia.pl .An Bryan Drewery Aq bryan@shatow.net -Wrote the initial manual page, mostly from forum post. +wrote this manual page and contributed child dataset fixes From 47bc1442a2afa74486c99c8309c09bcd77d9a1b9 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Mon, 14 May 2012 17:33:58 -0500 Subject: [PATCH 3/3] Cleanup manpage findings Found By: textproc/igor --- beadm.1 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/beadm.1 b/beadm.1 index af44ad4..37cb2e3 100644 --- a/beadm.1 +++ b/beadm.1 @@ -50,7 +50,7 @@ The command is used to setup and interact with Boot Environments with ZFS. .Pp .Em Boot Environments -allow you to upgrade your system, while preserving your old environment in a separate ZFS dataset. +allows the system to be upgraded, while preserving the old system environment in a separate ZFS dataset. .Pp .Sh COMMANDS The following commands are supported by @@ -58,7 +58,7 @@ The following commands are supported by .Bl -tag -width indent .It Ic activate Ar .Pp -Activate the given +Activate the given .Ar beName for the next boot. .Pp @@ -103,7 +103,7 @@ to the given .Sh EXAMPLES .Bl -bullet .It -Perform a system upgrade in a +Perform a system upgrade in a .Xr jail 8 .Pp Create a new boot environment called @@ -116,8 +116,9 @@ Set mountpoint for new jail to .Pp .Dl zfs set mountpoint=/usr/jails/jailed zroot/ROOT/jailed .Pp -Your current boot environment is now replicated into the jailed system. -Startup the jail, login and perform the normal upgrade process. Once this is done, stop the jail and disable it in +The currently active boot environment is now replicated into the jailed system and ready for upgrade. +Startup the jail, login and perform the normal upgrade process. +Once this is done, stop the jail and disable it in .Pa /etc/rc.conf. .Pp Now activate the boot environment for the next boot @@ -129,7 +130,7 @@ Reboot into the new environment .Dl reboot .El .Sh HOWTO -A HOWTO guide is posted at the FreeBSD forums: +A HOWTO guide is posted at the FreeBSD forums: .Bl -bullet .It .Ar http://forums.freebsd.org/showthread.php?t=31662