summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xezjail-admin7
-rwxr-xr-xezjail.sh1
2 files changed, 5 insertions, 3 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 2c6e7ee..1a560e0 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -1,4 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2# $Id$
2 3
3# ugly: this variable is set during port install time 4# ugly: this variable is set during port install time
4ezjail_prefix=EZJAIL_PREFIX 5ezjail_prefix=EZJAIL_PREFIX
@@ -251,13 +252,13 @@ create)
251 if [ -n "${ezjail_imageparams}" ] ; then 252 if [ -n "${ezjail_imageparams}" ] ; then
252 ezjail_attachparams=`echo $0 _parse_g${ezjail_imagetype}_attach_args_ ${ezjail_imageparams} | /bin/sh ` 253 ezjail_attachparams=`echo $0 _parse_g${ezjail_imagetype}_attach_args_ ${ezjail_imageparams} | /bin/sh `
253 [ 0 -eq $? ] || exerr "processing of ezjail_imageparams failed" 254 [ 0 -eq $? ] || exerr "processing of ezjail_imageparams failed"
254 fi 255 fi
255 case "${ezjail_imagetype}" in 256 case "${ezjail_imagetype}" in
256 bde) init_cmd="gbde init /dev/${ezjail_imagedevice} ${ezjail_imageparams}" 257 bde) init_cmd="gbde init /dev/${ezjail_imagedevice} ${ezjail_imageparams}"
257 attach_cmd="gbde attach /dev/${ezjail_imagedevice} ${ezjail_attachparams}";; 258 attach_cmd="gbde attach /dev/${ezjail_imagedevice} ${ezjail_attachparams}";;
258 eli) init_cmd="geli init ${ezjail_imageparams} /dev/${ezjail_imagedevice}" 259 eli) init_cmd="geli init ${ezjail_imageparams} /dev/${ezjail_imagedevice}"
259 attach_cmd="geli attach ${ezjail_attachparams} /dev/${ezjail_imagedevice}";; 260 attach_cmd="geli attach ${ezjail_attachparams} /dev/${ezjail_imagedevice}";;
260 esac 261 esac
261 echo "Initialising crypto device. Enter a new passphrase twice... (if necessary)" 262 echo "Initialising crypto device. Enter a new passphrase twice... (if necessary)"
262 ( echo ${init_cmd} | /bin/sh ) || detach_images || exerr "Error: Could not initialise crypto image." 263 ( echo ${init_cmd} | /bin/sh ) || detach_images || exerr "Error: Could not initialise crypto image."
263 264
diff --git a/ezjail.sh b/ezjail.sh
index 13625fe..dbf78ca 100755
--- a/ezjail.sh
+++ b/ezjail.sh
@@ -1,4 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2# $Id$
2# 3#
3# $FreeBSD$ 4# $FreeBSD$
4# 5#