Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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...
commit 4e908a576d43035ef2fe5c1306775956754b100f 2 parents 0a86a3f + fb1386c
@jeffmccune jeffmccune authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  ext/suse/client.init
View
2  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}"
Please sign in to comment.
Something went wrong with that request. Please try again.