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

* fix/3.1.x/suse_init: Ensure 'agent' subcommand is executed
pruan-rht · Mar 7, 2013 · 4e908a5 · 4e908a5
2 parents 0a86a3f + fb1386c
commit 4e908a5
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}"