mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 05:52:26 +00:00
Merge pull request #1676 from stephenc/jenkins-28111
[FIXED JENKINS-28111] JNLP slave JVM Options are inconsistently applied
This commit is contained in:
commit
ce94434b16
1 file changed
+2
-2
@@ -57,7 +57,7 @@ THE SOFTWARE.
|
||||
<p>
|
||||
${%Or if the slave is headless:}
|
||||
</p>
|
||||
<pre>java -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
|
||||
<pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
|
||||
</li>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
@@ -66,7 +66,7 @@ THE SOFTWARE.
|
||||
${%Run from slave command line:}
|
||||
</p>
|
||||
<!-- TODO conceal secret w/ JS if possible -->
|
||||
<pre>java -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp -secret ${it.jnlpMac}</pre>
|
||||
<pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp -secret ${it.jnlpMac}</pre>
|
||||
</li>
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
|
||||
Reference in new issue
Block a user