Removed the -u switch from parameter list, since currently there is no way I know of to properly pass a pasphrase to gbde or geli command (except gbde -p, which might be implemented later)

1 files changed, 5 insertions, 10 deletions

diff --git a/ezjail-admin b/ezjail-admin
index 9a68ab0..2b6dcf7 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -33,7 +33,7 @@ case `uname -p` in amd64) ezjail_dirlist="${ezjail_dirlist} usr/lib32";; esac
 
 # Synopsis messages
 ezjail_usage_ezjailadmin="Usage: `basename -- $0` [config|create|delete|install|list|update] {params}"
-ezjail_usage_create="Usage: `basename -- $0` create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli] [-u passurl] [-C args] jailname jailip"
+ezjail_usage_create="Usage: `basename -- $0` create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli] [-C args] jailname jailip"
 ezjail_usage_delete="Usage: `basename -- $0` delete [-w] jailname"
 ezjail_usage_list="Usage: `basename -- $0` list"
 ezjail_usage_update="Usage: `basename -- $0` update [-s sourcetree] [-i] [-pP]"
@@ -85,7 +85,6 @@ fetchjailinfo () {
   eval ezjail_attachparams=\"\$jail_${ezjail_safename}_attachparams\"
   eval ezjail_attachblocking=\"\$jail_${ezjail_safename}_attachblocking\"
   eval ezjail_forceblocking=\"\$jail_${ezjail_safename}_forceblocking\"
-  eval ezjail_passphraseurl=\"\$jail_${ezjail_safename}_passphraseurl\"
 
   ezjail_softlink=${ezjail_jaildir}/`basename -- ${ezjail_rootdir}`
 
@@ -163,8 +162,8 @@ case "$1" in
 ######################## ezjail-admin CREATE ########################
 create)
   # Clean variables, prevent polution
-  unset ezjail_rootdir ezjail_flavour ezjail_softlink ezjail_image ezjail_imagetype ezjail_imageparams ezjail_imagesize ezjail_device ezjail_config ezjail_attachparams ezjail_passphraseurl ezjail_exists ezjail_attachblocking ezjail_forceblocking
-  shift; while getopts :f:r:s:xbic:u:C: arg; do case ${arg} in
+  unset ezjail_rootdir ezjail_flavour ezjail_softlink ezjail_image ezjail_imagetype ezjail_imageparams ezjail_imagesize ezjail_device ezjail_config ezjail_attachparams ezjail_exists ezjail_attachblocking ezjail_forceblocking
+  shift; while getopts :f:r:s:xbic:C: arg; do case ${arg} in
     x) ezjail_exists="YES";;
     r) ezjail_rootdir="${OPTARG}";;
     f) ezjail_flavour="${OPTARG}";;
@@ -173,7 +172,6 @@ create)
     b) ezjail_forceblocking="YES";;
     i) ezjail_imagetype=${ezjail_imagetype:-"simple"};;
     s) ezjail_imagesize="${OPTARG}";;
-    u) ezjail_urlpass="${OPTARG}";;
     ?) exerr ${ezjail_usage_create};;
   esac; done; shift $(( ${OPTIND} - 1 ))
 
@@ -271,7 +269,7 @@ create)
       case "${ezjail_imagetype}" in
         bde|eli)
           # parse imageparams, generate attachparams
-          [ -n  "${ezjail_passphraseurl}" ] || ezjail_attachblocking="YES"
+          ezjail_attachblocking="YES"
           if [ -n "${ezjail_imageparams}" ]; then
             ezjail_attachparams=`echo $0 _parse_g${ezjail_imagetype}_attach_args_ ${ezjail_imageparams} | /bin/sh `
             [ 5 -eq $? ] && exerr "processing of ezjail_imageparams failed"
@@ -342,7 +340,6 @@ create)
   echo export jail_${ezjail_safename}_attachparams=\"${ezjail_attachparams}\" >> ${ezjail_config}
   echo export jail_${ezjail_safename}_attachblocking=\"${ezjail_attachblocking}\" >> ${ezjail_config}
   echo export jail_${ezjail_safename}_forceblocking=\"${ezjail_forceblocking}\" >> ${ezjail_config}
-  echo export jail_${ezjail_safename}_passphraseurl=\"${ezjail_passphraseurl}\" >> ${ezjail_config}
 
   # Final steps for flavour installation
   if [ -z "${ezjail_exists}" -a -n "${ezjail_flavour}" ]; then
@@ -378,8 +375,6 @@ create)
   [ $? = 0 ] && echo -e "Warning: Some services already seem to be listening on all IP, (including ${ezjail_ip})\n  This may cause some confusion, here they are:\n${ezjail_listener}"
   IFS=${TIFS}
 
-  [ -n "${ezjail_passphraseurl}" ] && echo -e "You specified a passphrase file location ${ezjail_passphraseurl}\nThis will be fetched by ezjail.sh when auto-running this jail. The file should contain a line in the form\njail_${ezjail_safename}_passphrase=YOURPASSPHRASE\n. If fetching fails or the file does not contain that line, the jail ${ezjail_name} will not be started, even if no passphrase was necessary."
-
   ;;
 ######################## ezjail-admin DELETE ########################
 delete)
@@ -603,7 +598,7 @@ config)
       case ${ezjail_imagetype} in
       crypto|bde)
         echo "Attaching bde device for image jail ${ezjail}..."
-        echo gbde attach /dev/${ezjail_imagedevice} ${ezjail_attachparams} | /bin/sh 
+        echo gbde attach /dev/${ezjail_imagedevice} ${ezjail_attachparams} | /bin/sh
         [ $? -eq 0 ] || detach_images keep || exerr "Error: Attaching bde device failed."
         # Device to mount is not md anymore
         ezjail_device=${ezjail_imagedevice}.bde