ruben/ezjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

An empty ezjail directory made rcorder fail. Fixed

Browse Source
This commit is contained in:
erdgeist 2006-04-24 10:59:04 +00:00
parent 6ee8b2a5b6
commit 0377eb1c57
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ezjail-admin
View File

@ -303,8 +303,7 @@ delete)
;; ;;
######################## ezjail-admin LIST ######################## ######################## ezjail-admin LIST ########################
list) list)
ezjail_list=${ezjail_list:-`rcorder ${ezjail_prefix}/etc/ezjail/*`} ezjail_list=`find -X ${ezjail_prefix}/etc/ezjail/ 2> /dev/null | xargs rcorder | xargs basename -a`
ezjail_list=`basename -a ${ezjail_list}`
printf "%-3s %-5s %-15s %-28s %s\\n" STA JID IP Hostname "Root Directory" printf "%-3s %-5s %-15s %-28s %s\\n" STA JID IP Hostname "Root Directory"
echo "--- ----- --------------- ---------------------------- -----------------------------" echo "--- ----- --------------- ---------------------------- -----------------------------"

7
ezjail.sh
View File

@ -34,9 +34,7 @@ stopcrypto_cmd="do_cmd stopcrypto _"
do_cmd() do_cmd()
{ {
action=$1; message=$2; shift 2; action=$1; message=$2; shift 2;
ezjail_list= unset ezjail_list ezjail_pass ezjail_mds
ezjail_pass=
ezjail_mds=
ezjail_fromrc="YES" ezjail_fromrc="YES"
# If a jail list is given on command line, process it # If a jail list is given on command line, process it
@ -45,8 +43,7 @@ do_cmd()
ezjail_list=`echo -n $* | tr -c "[:alnum:] " _` ezjail_list=`echo -n $* | tr -c "[:alnum:] " _`
ezjail_fromrc="NO" ezjail_fromrc="NO"
else else
ezjail_list=${ezjail_list:-`rcorder ${ezjail_prefix}/etc/ezjail/*`} ezjail_list=`find -X ${ezjail_prefix}/etc/ezjail/ 2> /dev/null | xargs rcorder | xargs basename -a`
ezjail_list=`basename -a ${ezjail_list}`
echo -n "${message##_}" echo -n "${message##_}"
fi fi