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

11 years ago · 2c6e3e0e96
parent ae477d69c8 c31278bcd0
commit 2c6e3e0e96
3 changed files with 3 additions and 3 deletions
--- a/cdist/conf/type/__jail/explorer/basepresent
+++ b/cdist/conf/type/__jail/explorer/basepresent
@ -26,7 +26,7 @@
 #set -x

 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/explorer/present
+++ b/cdist/conf/type/__jail/explorer/present
@ -32,7 +32,7 @@ else
 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/explorer/status
+++ b/cdist/conf/type/__jail/explorer/status
@ -32,7 +32,7 @@ else
 fi

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