Add and use DO_NOT_REBOOT_IN_SILENT=1 parameter for MSI to not reboot automatically when running from the updater.
Signed-off-by: alex-z <blackslayer4@gmail.com>
This commit is contained in:
parent
bc51d30e50
commit
e40142847b
|
@ -81,7 +81,7 @@
|
|||
<Custom Action="RegistryCleanupCustomAction" After="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
|
||||
|
||||
<!-- Schedule Reboot for the Shell Extensions (in silent installation mode only, or if SCHEDULE_REBOOT argument is set-->
|
||||
<ScheduleReboot After="InstallFinalize">(SCHEDULE_REBOOT=1) OR NOT (UILevel=2)</ScheduleReboot>
|
||||
<ScheduleReboot After="InstallFinalize">(SCHEDULE_REBOOT=1) OR (NOT (UILevel=2) AND NOT (DO_NOT_REBOOT_IN_SILENT=1))</ScheduleReboot>
|
||||
</InstallExecuteSequence>
|
||||
|
||||
<!-- "Add or Remove" Programs Entries -->
|
||||
|
|
|
@ -222,7 +222,7 @@ void OCUpdater::slotStartInstaller()
|
|||
};
|
||||
|
||||
QString msiLogFile = cfg.configPath() + "msi.log";
|
||||
QString command = QString("&{msiexec /promptrestart /passive /i '%1' /L*V '%2'| Out-Null ; &'%3'}")
|
||||
QString command = QString("&{msiexec /promptrestart /passive /i '%1' DO_NOT_REBOOT_IN_SILENT=1 /L*V '%2'| Out-Null ; &'%3'}")
|
||||
.arg(preparePathForPowershell(updateFile))
|
||||
.arg(preparePathForPowershell(msiLogFile))
|
||||
.arg(preparePathForPowershell(QCoreApplication::applicationFilePath()));
|
||||
|
|
Loading…
Reference in New Issue