Typo and put ezjails share, where it belongs
This commit is contained in:
parent
428061fe55
commit
282bc393f8
@ -3,7 +3,7 @@
|
|||||||
# ugly: this variable is set during port install time
|
# ugly: this variable is set during port install time
|
||||||
ezjail_prefix=EZJAIL_PREFIX
|
ezjail_prefix=EZJAIL_PREFIX
|
||||||
ezjail_etc=${ezjail_prefix}/etc
|
ezjail_etc=${ezjail_prefix}/etc
|
||||||
ezjail_share=${ezjail_prefix}/share
|
ezjail_share=${ezjail_prefix}/share/ezjail
|
||||||
ezjail_jailcfgs=${ezjail_etc}/ezjail
|
ezjail_jailcfgs=${ezjail_etc}/ezjail
|
||||||
|
|
||||||
if [ -f ${ezjail_etc}/ezjail.conf ]; then
|
if [ -f ${ezjail_etc}/ezjail.conf ]; then
|
||||||
@ -92,16 +92,14 @@ create)
|
|||||||
# but /ezjail_etc/ezjail.flavour.httpd, whatever ./httpd would be
|
# but /ezjail_etc/ezjail.flavour.httpd, whatever ./httpd would be
|
||||||
# For now exit with error, maybe just warn later.
|
# For now exit with error, maybe just warn later.
|
||||||
[ -f "$newjail_flavour" ] && newjail_flav=${newjail_flavour}
|
[ -f "$newjail_flavour" ] && newjail_flav=${newjail_flavour}
|
||||||
|
|
||||||
# if flavour contains a '/', it aint a short name
|
# if flavour contains a '/', it aint a short name
|
||||||
if [ ${newjail_flavour} = ${newjail_flavour%/*} -a \
|
if [ ${newjail_flavour} = ${newjail_flavour%/*} -a \
|
||||||
-f ${ezjail_etc}/ezjail.flavour.${newjail_flavour} ]; then
|
-f ${ezjail_etc}/ezjail.flavour.${newjail_flavour} ]; then
|
||||||
[ "$newjail_flav" ] && exerr "Error: flavour ${newjail_flavour} conflicts with file ./${newjail_flavour}"
|
[ "$newjail_flav" ] && exerr "Error: flavour ${newjail_flavour} conflicts with file ./${newjail_flavour}"
|
||||||
$newjail_flav=${ezjail_etc}/ezjail.flavour.${newjail_flavour}
|
newjail_flav=${ezjail_etc}/ezjail.flavour.${newjail_flavour}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Flavour not found
|
# Flavour not found
|
||||||
[ "$newjail_flav" ] || exerr "Error: Flavour file $newjail_flavour not found"
|
[ "$newjail_flav" ] || exerr "Error: Flavour file ${newjail_flavour} not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# now take a copy of our template jail
|
# now take a copy of our template jail
|
||||||
|
Loading…
x
Reference in New Issue
Block a user