From 1bd27fffaefffeb040a353da629ddad2a68d73a8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 27 Nov 2012 10:57:10 +0100 Subject: [PATCH] __jail: started -> stopped, correct help output Signed-off-by: Nico Schottelius --- cdist/conf/type/__jail/gencode-remote | 6 +++--- cdist/conf/type/__jail/man.text | 4 ++-- cdist/conf/type/__jail/parameter/boolean | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cdist/conf/type/__jail/gencode-remote b/cdist/conf/type/__jail/gencode-remote index 56a1b643..1f326bf1 100755 --- a/cdist/conf/type/__jail/gencode-remote +++ b/cdist/conf/type/__jail/gencode-remote @@ -34,8 +34,8 @@ fi state="$(cat "$__object/parameter/state")" -started="false" -[ -f "$__object/parameter/started" -a "$state" = "present" ] && started="true" +started="true" +[ -f "$__object/parameter/stopped" ] && started="false" if [ -f "$__object/parameter/ip" ]; then ip="$(cat "$__object/parameter/ip")" @@ -75,7 +75,7 @@ fi # is pointless. Treat this as an error. if [ -n "$devfsruleset" -a "$devfsenable" = "false" ]; then exec >&2 - echo "Can't have --devfs-ruleset defined without --devfs-disable" + echo "Can't have --devfs-ruleset defined with --devfs-disable" exit 1 fi diff --git a/cdist/conf/type/__jail/man.text b/cdist/conf/type/__jail/man.text index f4b9e3a1..48794637 100644 --- a/cdist/conf/type/__jail/man.text +++ b/cdist/conf/type/__jail/man.text @@ -49,8 +49,8 @@ jaildir:: BOOLEAN PARAMETERS ------------------ -started:: - Whether to start jail +stopped:: + Do not start the jail devfs-disable:: Whether to disallow devfs mounting within the jail diff --git a/cdist/conf/type/__jail/parameter/boolean b/cdist/conf/type/__jail/parameter/boolean index 1dd61f6b..39144f6f 100644 --- a/cdist/conf/type/__jail/parameter/boolean +++ b/cdist/conf/type/__jail/parameter/boolean @@ -1,3 +1,3 @@ onboot -started +stopped devfs-disable