Merge branch 'jailfix' of https://github.com/jdguffey/cdist
This commit is contained in:
		
				commit
				
					
						2c6e3e0e96
					
				
			
		
					 3 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue