summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xezjail-admin8
1 files changed, 3 insertions, 5 deletions
diff --git a/ezjail-admin b/ezjail-admin
index d9fce50..cf2816e 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -3,7 +3,7 @@
3# ugly: this variable is set during port install time 3# ugly: this variable is set during port install time
4ezjail_prefix=EZJAIL_PREFIX 4ezjail_prefix=EZJAIL_PREFIX
5ezjail_etc=${ezjail_prefix}/etc 5ezjail_etc=${ezjail_prefix}/etc
6ezjail_share=${ezjail_prefix}/share 6ezjail_share=${ezjail_prefix}/share/ezjail
7ezjail_jailcfgs=${ezjail_etc}/ezjail 7ezjail_jailcfgs=${ezjail_etc}/ezjail
8 8
9if [ -f ${ezjail_etc}/ezjail.conf ]; then 9if [ -f ${ezjail_etc}/ezjail.conf ]; then
@@ -92,16 +92,14 @@ create)
92 # but /ezjail_etc/ezjail.flavour.httpd, whatever ./httpd would be 92 # but /ezjail_etc/ezjail.flavour.httpd, whatever ./httpd would be
93 # For now exit with error, maybe just warn later. 93 # For now exit with error, maybe just warn later.
94 [ -f "$newjail_flavour" ] && newjail_flav=${newjail_flavour} 94 [ -f "$newjail_flavour" ] && newjail_flav=${newjail_flavour}
95
96 # if flavour contains a '/', it aint a short name 95 # if flavour contains a '/', it aint a short name
97 if [ ${newjail_flavour} = ${newjail_flavour%/*} -a \ 96 if [ ${newjail_flavour} = ${newjail_flavour%/*} -a \
98 -f ${ezjail_etc}/ezjail.flavour.${newjail_flavour} ]; then 97 -f ${ezjail_etc}/ezjail.flavour.${newjail_flavour} ]; then
99 [ "$newjail_flav" ] && exerr "Error: flavour ${newjail_flavour} conflicts with file ./${newjail_flavour}" 98 [ "$newjail_flav" ] && exerr "Error: flavour ${newjail_flavour} conflicts with file ./${newjail_flavour}"
100 $newjail_flav=${ezjail_etc}/ezjail.flavour.${newjail_flavour} 99 newjail_flav=${ezjail_etc}/ezjail.flavour.${newjail_flavour}
101 fi 100 fi
102
103 # Flavour not found 101 # Flavour not found
104 [ "$newjail_flav" ] || exerr "Error: Flavour file $newjail_flavour not found" 102 [ "$newjail_flav" ] || exerr "Error: Flavour file ${newjail_flavour} not found"
105 fi 103 fi
106 104
107 # now take a copy of our template jail 105 # now take a copy of our template jail