diff options
-rwxr-xr-x | ezjail-admin | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ezjail-admin b/ezjail-admin index da5b565..6a4b91d 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -210,8 +210,7 @@ create) | |||
210 | 210 | ||
211 | # check for a sane image size and split it up in blocks | 211 | # check for a sane image size and split it up in blocks |
212 | if [ "${ezjail_imagesize}" ]; then | 212 | if [ "${ezjail_imagesize}" ]; then |
213 | _val=`echo "${ezjail_imagesize}"|tr A-Z a-z|sed -Ees:g:km:g -es:m:kk:g -es:k:*2b:g -es:b:*128w:g -es:w:*4\ :g -e"s:(^|[^0-9])0x:\1\0X:g" -ey:x:*:` | 213 | _val=`echo "${ezjail_imagesize}"|tr A-Z a-z|sed -Ees:g:km:g -es:m:kk:g -es:k:*2b:g -es:b:*128w:g -es:w:*4\ :g -e"s:(^|[^0-9])0x:\1\0X:g" -ey:x:*:|bc` |
214 | _val=`echo ${_val} | bc` | ||
215 | [ $? -eq 0 -a ${_val} -gt 0 ] || exerr "Error: The image size you specified is somehow incomprehensible (you specified ${ezjail_imagesize})." | 214 | [ $? -eq 0 -a ${_val} -gt 0 ] || exerr "Error: The image size you specified is somehow incomprehensible (you specified ${ezjail_imagesize})." |
216 | ezjail_imageblockcount=`echo ${_val} / 1048576 | bc` | 215 | ezjail_imageblockcount=`echo ${_val} / 1048576 | bc` |
217 | ezjail_imagerestbytes=`echo ${_val} % 1048576 | bc` | 216 | ezjail_imagerestbytes=`echo ${_val} % 1048576 | bc` |
@@ -449,7 +448,7 @@ list) | |||
449 | ezjail_list=`find -X ${ezjail_prefix}/etc/ezjail/ 2> /dev/null | xargs rcorder | xargs basename -a` | 448 | ezjail_list=`find -X ${ezjail_prefix}/etc/ezjail/ 2> /dev/null | xargs rcorder | xargs basename -a` |
450 | 449 | ||
451 | printf "%-3s %-5s %-15s %-28s %s\\n" STA JID IP Hostname "Root Directory" | 450 | printf "%-3s %-5s %-15s %-28s %s\\n" STA JID IP Hostname "Root Directory" |
452 | echo "--- ----- --------------- ---------------------------- -----------------------------" | 451 | echo "--- ----- --------------- ---------------------------- -------------------------" |
453 | for ezjail in ${ezjail_list}; do | 452 | for ezjail in ${ezjail_list}; do |
454 | fetchjailinfo ${ezjail%.norun} | 453 | fetchjailinfo ${ezjail%.norun} |
455 | case ${ezjail_imagetype} in simple) ezjail_state="I";; bde) ezjail_state="B";; eli) ezjail_state="E";; *) ezjail_state="D";; esac | 454 | case ${ezjail_imagetype} in simple) ezjail_state="I";; bde) ezjail_state="B";; eli) ezjail_state="E";; *) ezjail_state="D";; esac |