From 1a26436e7c139703daf1e774597d0b69baad470c Mon Sep 17 00:00:00 2001 From: erdgeist Date: Wed, 17 Mar 2010 10:16:20 +0000 Subject: Don't force a default flavour over a restore or create -x --- ezjail-admin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ezjail-admin') 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" case `uname -p` in amd64) ezjail_dirlist="${ezjail_dirlist} usr/lib32"; ezjail_basesystem="${ezjail_basesystem} lib32";; esac # Synopsis messages -ezjail_usage_ezjailadmin="${ezjail_admin} v3.1\nUsage: ${ezjail_admin} [archive|config|console|create|delete|install|list|restore|update] {params}" +ezjail_usage_ezjailadmin="${ezjail_admin} v3.1.1b\nUsage: ${ezjail_admin} [archive|config|console|create|delete|install|list|restore|update] {params}" ezjail_usage_install="Usage: ${ezjail_admin} install [-mMpPsS] [-h host] [-r release]" ezjail_usage_create="Usage: ${ezjail_admin} create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli|zfs] [-C args] [-a archive] jailname jailip" ezjail_usage_delete="Usage: ${ezjail_admin} delete [-w] jailname" @@ -505,7 +505,7 @@ create) fi # if no flavour specified on command line, use default flavour - : ${ezjail_flavours=${ezjail_default_flavour}} + [ "${ezjail_fromarchive}" -o "${ezjail_exists}" ] || : ${ezjail_flavours=${ezjail_default_flavour}} # do some sanity checks on the selected flavour (if any) for ezjail_flavour in ${ezjail_flavours}; do -- cgit v1.2.3