From 8179016b364708626abf883b5ef1bbec896f5a17 Mon Sep 17 00:00:00 2001 From: "Slawomir Wojciech Wojtczak (vermaden)" Date: Tue, 15 May 2012 07:21:12 +0200 Subject: [PATCH] manpage: update rename section; beadm: additional checks for arguments; --- beadm | 17 +++++++++++++++++ beadm.1 | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/beadm b/beadm index a6c2c83..9896081 100755 --- a/beadm +++ b/beadm @@ -201,6 +201,10 @@ case ${1} in ;; (activate) # ---------------------------------------------------------------- + if [ ${#} -ne 2 ] + then + __usage + fi __be_exist ${POOL}/ROOT/${2} if [ "${BOOTFS}" = "${POOL}/ROOT/${2}" ] then @@ -273,6 +277,10 @@ EOF ;; (destroy) # ---------------------------------------------------------------- + if [ ${#} -ne 2 ] + then + __usage + fi __be_exist ${POOL}/ROOT/${2} if [ "${BOOTFS}" = "${POOL}/ROOT/${2}" ] then @@ -321,7 +329,16 @@ EOF ;; (rename) # ------------------------------------------------------------------ + if [ ${#} -ne 2 ] + then + __usage + fi __be_exist ${POOL}/ROOT/${2} + if [ "${BOOTFS}" = "${POOL}/ROOT/${2}" ] + then + echo "ERROR: Renaming the active BE is not supported" + exit 1 + fi if zfs list -H -o name ${POOL}/ROOT/${3} 2> /dev/null then echo "ERROR: Boot environment '${3}' already exists" diff --git a/beadm.1 b/beadm.1 index 37cb2e3..7bb30fd 100644 --- a/beadm.1 +++ b/beadm.1 @@ -94,7 +94,7 @@ Displays all boot environments. .Pp .It Ic rename Ao Ar origBeName Ac Ao Ar newBeName Ac .Pp -Renames the given +Renames the given nonactive .Ar origBeName to the given .Ar newBeName