summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2013-04-20 00:19:16 +0000
committererdgeist <erdgeist@erdgeist.org>2013-04-20 00:19:16 +0000
commit11f04b1db06efda8ee3526cd22e8a29ba0e6ad67 (patch)
tree6275616ae6149ad4f0947a577af222369a511a68
parentac059f11542e3712b78cf6d74ed23c7dbf04c0b3 (diff)
Actually allow for the parentzfs parameter in getopt
-rwxr-xr-xezjail-admin6
1 files changed, 3 insertions, 3 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 91ae1f6..f22b6f8 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -42,9 +42,9 @@ ezjail_basesystem="base"
42case `uname -p` in amd64) ezjail_dirlist="${ezjail_dirlist} usr/lib32"; ezjail_basesystem="${ezjail_basesystem} lib32";; esac 42case `uname -p` in amd64) ezjail_dirlist="${ezjail_dirlist} usr/lib32"; ezjail_basesystem="${ezjail_basesystem} lib32";; esac
43 43
44# Synopsis messages 44# Synopsis messages
45ezjail_usage_ezjailadmin="${ezjail_admin} v3.2\nUsage: ${ezjail_admin} [archive|config|console|create|delete|install|list|restore|update] {params}" 45ezjail_usage_ezjailadmin="${ezjail_admin} v3.3\nUsage: ${ezjail_admin} [archive|config|console|create|delete|install|list|restore|update] {params}"
46ezjail_usage_install="Usage: ${ezjail_admin} install [-mMpPsS] [-h host] [-r release]" 46ezjail_usage_install="Usage: ${ezjail_admin} install [-mMpPsS] [-h host] [-r release]"
47ezjail_usage_create="Usage: ${ezjail_admin} create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli|zfs] [-C args] [-a archive] jailname jailip" 47ezjail_usage_create="Usage: ${ezjail_admin} create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli|zfs] [-C args] [-a archive] [-z parentzfs] jailname jailip"
48ezjail_usage_delete="Usage: ${ezjail_admin} delete [-wf] jailname" 48ezjail_usage_delete="Usage: ${ezjail_admin} delete [-wf] jailname"
49ezjail_usage_update="Usage: ${ezjail_admin} update [-s sourcetree|sourceosversion] [-p] (-b|-i|-u|-U|-P)" 49ezjail_usage_update="Usage: ${ezjail_admin} update [-s sourcetree|sourceosversion] [-p] (-b|-i|-u|-U|-P)"
50ezjail_usage_config="Usage: ${ezjail_admin} config [-r run|norun] [-n newname] [-c cpuset] [-z zfs-datasets] [-f fib] [-i attach|detach|fsck] jailname" 50ezjail_usage_config="Usage: ${ezjail_admin} config [-r run|norun] [-n newname] [-c cpuset] [-z zfs-datasets] [-f fib] [-i attach|detach|fsck] jailname"
@@ -449,7 +449,7 @@ case "$1" in
449create) 449create)
450 # Clean variables, prevent pollution 450 # Clean variables, prevent pollution
451 unset ezjail_rootdir ezjail_flavours ezjail_softlink ezjail_image ezjail_imagetype ezjail_imageparams ezjail_imagesize ezjail_parentfs ezjail_device ezjail_devicelink ezjail_config ezjail_attachparams ezjail_exists ezjail_attachblocking ezjail_forceblocking ezjail_sourcedevice ezjail_rootdirempty ezjail_fromarchive ezjail_fromarchive_config 451 unset ezjail_rootdir ezjail_flavours ezjail_softlink ezjail_image ezjail_imagetype ezjail_imageparams ezjail_imagesize ezjail_parentfs ezjail_device ezjail_devicelink ezjail_config ezjail_attachparams ezjail_exists ezjail_attachblocking ezjail_forceblocking ezjail_sourcedevice ezjail_rootdirempty ezjail_fromarchive ezjail_fromarchive_config
452 shift; while getopts :f:r:s:xbic:C:a:A: arg; do case ${arg} in 452 shift; while getopts :f:r:s:xbic:C:a:A:z: arg; do case ${arg} in
453 x) ezjail_exists="YES";; 453 x) ezjail_exists="YES";;
454 r) ezjail_rootdir=${OPTARG};; 454 r) ezjail_rootdir=${OPTARG};;
455 f) ezjail_flavours=${OPTARG};; 455 f) ezjail_flavours=${OPTARG};;