Permalink
Browse files

Merge branch 'fix/3.1.x/suse_init' into 3.1.x

* fix/3.1.x/suse_init:
  Ensure 'agent' subcommand is executed
  • Loading branch information...
2 parents 0a86a3f + fb1386c commit 4e908a576d43035ef2fe5c1306775956754b100f @jeffmccune jeffmccune committed Mar 7, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 ext/suse/client.init
View
@@ -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}"

0 comments on commit 4e908a5

Please sign in to comment.