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

11 years ago · c3508945ca
parent 565e11b16d 723be34bca
commit c3508945ca
3 changed files with 3 additions and 3 deletions
--- a/cdist/conf/type/__jail/gencode-local
+++ b/cdist/conf/type/__jail/gencode-local
@ -23,7 +23,7 @@
 #

 if [ -f "$__object/parameter/jaildir" ]; then
-   jaildir="$(cat "$__object/parameter/name")"
+   jaildir="$(cat "$__object/parameter/jaildir")"
 else
   jaildir="/usr/jail"
 fi
--- a/cdist/conf/type/__jail/gencode-remote
+++ b/cdist/conf/type/__jail/gencode-remote
@ -85,7 +85,7 @@ if [ -f "$__object/parameter/onboot" ]; then
 fi

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

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