summaryrefslogtreecommitdiff
path: root/ext/suse
diff options
context:
space:
mode:
authorAlex Cline <alex.cline@gmail.com>2013-03-07 14:52:17 -0500
committerJeff McCune <jeff@puppetlabs.com>2013-03-07 15:39:49 -0800
commitfb1386c0b792ccedc975eeb6c27dec33ab702a1c (patch)
tree20b28abf5282658287906ffb184df53091a97c5b /ext/suse
parent0a86a3f479662677b0c6c45a95647cf5b48e4101 (diff)
downloadpuppet-fb1386c0b792ccedc975eeb6c27dec33ab702a1c.tar.gz
Ensure 'agent' subcommand is executed
Ensure 'agent' subcommand is executed when PUPPET_SERVER is set in the puppet environment.
Diffstat (limited to 'ext/suse')
-rw-r--r--ext/suse/client.init2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/suse/client.init b/ext/suse/client.init
index 71f562d99..e54f462f4 100644
--- a/ext/suse/client.init
+++ b/ext/suse/client.init
@@ -39,7 +39,7 @@ puppetd=${PUPPETD-/usr/bin/puppet}
RETVAL=0
PUPPET_OPTS="agent"
-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
+[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="${PUPPET_OPTS} --server=${PUPPET_SERVER}"
[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"