From f90f322d99db4d0e5fdbe3c47a3b0f9420778773 Mon Sep 17 00:00:00 2001 From: Paul Reeves Date: Fri, 3 Jan 2020 13:49:27 +0100 Subject: [PATCH] CORE-3900 (Partial fix) Add /norestart flag when installing msvc runtimes. 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. --- builds/install/arch-specific/win32/FirebirdInstall_30.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builds/install/arch-specific/win32/FirebirdInstall_30.iss b/builds/install/arch-specific/win32/FirebirdInstall_30.iss index b3a2770acaa..878b1f5b45b 100644 --- a/builds/install/arch-specific/win32/FirebirdInstall_30.iss +++ b/builds/install/arch-specific/win32/FirebirdInstall_30.iss @@ -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