summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2006-04-24 10:59:04 +0000
committererdgeist <erdgeist@erdgeist.org>2006-04-24 10:59:04 +0000
commit0377eb1c57d28b634f1b21764aafc7656e1c3aaa (patch)
treec8e9507fba5ec09f24d6d50c9ee4b42bcfdfaf5f
parent6ee8b2a5b691673cf87f600c8ae66cfaaadfba64 (diff)
An empty ezjail directory made rcorder fail. Fixed
-rwxr-xr-xezjail-admin3
-rwxr-xr-xezjail.sh7
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 ########################
305list) 305list)
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 "--- ----- --------------- ---------------------------- -----------------------------"
diff --git a/ezjail.sh b/ezjail.sh
index da38870..1ff1b77 100755
--- a/ezjail.sh
+++ b/ezjail.sh
@@ -34,9 +34,7 @@ stopcrypto_cmd="do_cmd stopcrypto _"
34do_cmd() 34do_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