summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2010-03-17 10:16:20 +0000
committererdgeist <erdgeist@erdgeist.org>2010-03-17 10:16:20 +0000
commit1a26436e7c139703daf1e774597d0b69baad470c (patch)
tree7a3a55aba65f14e713e3edf3a5a6f450235dd16e
parent253658a81d11e1bbf22c9b82a55f40431e7985b9 (diff)
Don't force a default flavour over a restore or create -x
-rwxr-xr-xezjail-admin4
1 files changed, 2 insertions, 2 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 474ea08..3df96e5 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -42,7 +42,7 @@ 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.1\nUsage: ${ezjail_admin} [archive|config|console|create|delete|install|list|restore|update] {params}" 45ezjail_usage_ezjailadmin="${ezjail_admin} v3.1.1b\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] jailname jailip"
48ezjail_usage_delete="Usage: ${ezjail_admin} delete [-w] jailname" 48ezjail_usage_delete="Usage: ${ezjail_admin} delete [-w] jailname"
@@ -505,7 +505,7 @@ create)
505 fi 505 fi
506 506
507 # if no flavour specified on command line, use default flavour 507 # if no flavour specified on command line, use default flavour
508 : ${ezjail_flavours=${ezjail_default_flavour}} 508 [ "${ezjail_fromarchive}" -o "${ezjail_exists}" ] || : ${ezjail_flavours=${ezjail_default_flavour}}
509 509
510 # do some sanity checks on the selected flavour (if any) 510 # do some sanity checks on the selected flavour (if any)
511 for ezjail_flavour in ${ezjail_flavours}; do 511 for ezjail_flavour in ${ezjail_flavours}; do