diff options
-rwxr-xr-x | ezjail-admin | 3 | ||||
-rwxr-xr-x | ezjail.sh | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ezjail-admin b/ezjail-admin index 7132271..0b99d4b 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -303,8 +303,7 @@ delete) | |||
303 | ;; | 303 | ;; |
304 | ######################## ezjail-admin LIST ######################## | 304 | ######################## ezjail-admin LIST ######################## |
305 | list) | 305 | list) |
306 | ezjail_list=${ezjail_list:-`rcorder ${ezjail_prefix}/etc/ezjail/*`} | 306 | ezjail_list=`find -X ${ezjail_prefix}/etc/ezjail/ 2> /dev/null | xargs rcorder | xargs basename -a` |
307 | ezjail_list=`basename -a ${ezjail_list}` | ||
308 | 307 | ||
309 | printf "%-3s %-5s %-15s %-28s %s\\n" STA JID IP Hostname "Root Directory" | 308 | printf "%-3s %-5s %-15s %-28s %s\\n" STA JID IP Hostname "Root Directory" |
310 | echo "--- ----- --------------- ---------------------------- -----------------------------" | 309 | echo "--- ----- --------------- ---------------------------- -----------------------------" |
@@ -34,9 +34,7 @@ stopcrypto_cmd="do_cmd stopcrypto _" | |||
34 | do_cmd() | 34 | do_cmd() |
35 | { | 35 | { |
36 | action=$1; message=$2; shift 2; | 36 | action=$1; message=$2; shift 2; |
37 | ezjail_list= | 37 | unset ezjail_list ezjail_pass ezjail_mds |
38 | ezjail_pass= | ||
39 | ezjail_mds= | ||
40 | ezjail_fromrc="YES" | 38 | ezjail_fromrc="YES" |
41 | 39 | ||
42 | # If a jail list is given on command line, process it | 40 | # If a jail list is given on command line, process it |
@@ -45,8 +43,7 @@ do_cmd() | |||
45 | ezjail_list=`echo -n $* | tr -c "[:alnum:] " _` | 43 | ezjail_list=`echo -n $* | tr -c "[:alnum:] " _` |
46 | ezjail_fromrc="NO" | 44 | ezjail_fromrc="NO" |
47 | else | 45 | else |
48 | ezjail_list=${ezjail_list:-`rcorder ${ezjail_prefix}/etc/ezjail/*`} | 46 | ezjail_list=`find -X ${ezjail_prefix}/etc/ezjail/ 2> /dev/null | xargs rcorder | xargs basename -a` |
49 | ezjail_list=`basename -a ${ezjail_list}` | ||
50 | echo -n "${message##_}" | 47 | echo -n "${message##_}" |
51 | fi | 48 | fi |
52 | 49 | ||