fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'jailfix' of https://github.com/jdguffey/cdist

Browse source
This commit is contained in:
Nico Schottelius 2014-01-27 19:37:23 +01:00
commit c3508945ca
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__jail/gencode-local
View file

@ -23,7 +23,7 @@
# #
if [ -f "$__object/parameter/jaildir" ]; then if [ -f "$__object/parameter/jaildir" ]; then
jaildir="$(cat "$__object/parameter/name")" jaildir="$(cat "$__object/parameter/jaildir")"
else else
jaildir="/usr/jail" jaildir="/usr/jail"
fi fi

2
cdist/conf/type/__jail/gencode-remote
View file

@ -85,7 +85,7 @@ if [ -f "$__object/parameter/onboot" ]; then
fi fi
if [ -f "$__object/parameter/jaildir" ]; then if [ -f "$__object/parameter/jaildir" ]; then
jaildir="$(cat "$__object/parameter/name")" jaildir="$(cat "$__object/parameter/jaildir")"
else else
jaildir="/usr/jail" jaildir="/usr/jail"
fi fi

2
cdist/conf/type/__jail/manifest
View file

@ -34,7 +34,7 @@ if [ ! "$os" = "freebsd" ]; then
fi fi
if [ -f "$__object/parameter/jaildir" ]; then if [ -f "$__object/parameter/jaildir" ]; then
jaildir="$(cat "$__object/parameter/name")" jaildir="$(cat "$__object/parameter/jaildir")"
else else
jaildir="/usr/jail" jaildir="/usr/jail"
fi fi