Merge branch '3.1.x'

* 3.1.x: Ensure 'agent' subcommand is executed closes puppetlabs#1520
pruan-rht · Mar 7, 2013 · 7e3d491 · 7e3d491
2 parents 1e47c12 + 4e908a5
commit 7e3d491
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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}"