[FIXED JENKINS-7288]

Used ReallySuppress as suggested in the ticket to hopefully fix the reboot problem.
jenkinsci · Sep 17, 2011 · d9ffc44 · d9ffc44
1 parent 83f204f
commit d9ffc44
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Fixed the reported system reboot problem on installing JDK on Windows
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7288">issue 7288</a>)
   <li class=bug>
     Fixed the OutOfMemoryError in trying to download/install JDK
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10689">issue 10689</a>)

diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java
@@ -224,7 +224,7 @@ I tried to locate exactly how InstallShield parses the arguments (and why it use
             args.add("/s");
             // according to http://community.acresso.com/showthread.php?t=83301, \" is the trick to quote values with whitespaces.
             // Oh Windows, oh windows, why do you have to be so difficult?
-            args.add("/v/qn REBOOT=Suppress INSTALLDIR=\\\""+ expectedLocation +"\\\" /L \\\""+logFile+"\\\"");
+            args.add("/v/qn REBOOT=ReallySuppress INSTALLDIR=\\\""+ expectedLocation +"\\\" /L \\\""+logFile+"\\\"");
 
             int r = launcher.launch().cmds(args).stdout(out)
                     .pwd(new FilePath(launcher.getChannel(), expectedLocation)).join();