matze/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix issue #147

Browse source 
--state absent should imply --stopped.
This commit is contained in:
Jake Guffey 2012-12-11 11:15:21 -05:00
parent 18a90eddee
commit 7d7ad2630c
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,8 @@ fi
state="$(cat "$__object/parameter/state")" state="$(cat "$__object/parameter/state")"
started="true" started="true"
[ -f "$__object/parameter/stopped" ] && started="false" # If the user wants the jail gone, it implies it shouldn't be started.
[ -f "$__object/parameter/stopped" -o "$state" = "absent" ] && started="false"
if [ -f "$__object/parameter/ip" ]; then if [ -f "$__object/parameter/ip" ]; then
ip="$(cat "$__object/parameter/ip")" ip="$(cat "$__object/parameter/ip")"
@ -92,14 +93,6 @@ fi
present="$(cat "$__object/explorer/present")" present="$(cat "$__object/explorer/present")"
status="$(cat "$__object/explorer/status")" status="$(cat "$__object/explorer/status")"
# Defining a jail as absent and started at the same time
# makes no sense. Treat this as an error.
if [ "$started" = "true" -a "$state" = "absent" ]; then
exec >&2
echo "Can't have --state absent and --started true together\!"
exit 1
fi
stopJail() { stopJail() {
# Check $status before issuing command # Check $status before issuing command
if [ "$status" = "STARTED" ]; then if [ "$status" = "STARTED" ]; then