Skip to content

Commit

Permalink
CORE-3900 (Partial fix) Add /norestart flag when installing msvc runt…
Browse files Browse the repository at this point in the history
…imes.

This at least prevents an unplanned reboot. A full fix will require calling msiexec differently so that we can pick up the errorcode if a reboot actually is required.
  • Loading branch information
reevespaul committed Jan 3, 2020
1 parent c511f35 commit f90f322
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions builds/install/arch-specific/win32/FirebirdInstall_30.iss
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,9 @@ Name: EnableLegacyClientAuth; Description: {cm:EnableLegacyClientAuth}; Componen

[Run]
#if msvc_version == 10
Filename: msiexec.exe; Parameters: "/qn /i ""{tmp}\vccrt{#msvc_version}_Win32.msi"" /L*v ""{tmp}\vccrt{#msvc_version}_Win32.log"" "; StatusMsg: {cm:InstallingMSVC32runtimes}; Check: HasWI30; Components: ClientComponent;
Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_version}_Win32.msi"" /L*v ""{tmp}\vccrt{#msvc_version}_Win32.log"" "; StatusMsg: {cm:InstallingMSVC32runtimes}; Check: HasWI30; Components: ClientComponent;
#if PlatformTarget == "x64"
Filename: msiexec.exe; Parameters: "/qn /i ""{tmp}\vccrt{#msvc_version}_x64.msi"" /L*v ""{tmp}\vccrt{#msvc_version}_x64.log"" "; StatusMsg: {cm:InstallingMSVC64runtimes}; Check: HasWI30; Components: ClientComponent;
Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_version}_x64.msi"" /L*v ""{tmp}\vccrt{#msvc_version}_x64.log"" "; StatusMsg: {cm:InstallingMSVC64runtimes}; Check: HasWI30; Components: ClientComponent;
#endif
#endif

Expand Down

0 comments on commit f90f322

Please sign in to comment.