[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/4] qemu-ga: Prevent QEMU-GA VSS provider from b
From: |
Leonid Bloch |
Subject: |
[Qemu-devel] [PATCH v3 4/4] qemu-ga: Prevent QEMU-GA VSS provider from being unregistered on MSI reinstall |
Date: |
Mon, 3 Aug 2015 20:54:24 +0300 |
Previously, running the .msi would unregister the QEMU GA VSS service if QEMU
GA was already installed on the machine, and then register it only if QEMU GA
was NOT previously installed. This behavior caused the service to be registered
only after the INITIAL installation, and any subsequent run of the .msi (to
redo, repair, or upgrade the installation) ended in the service being
unregistered.
Now, the VSS service is still unregistered if QEMU GA is already installed (so
that a fix or an update could be performed) but then it is registered again (if
the GA is not being uninstalled) thus finishing the repair/upgrade correctly.
Additionally, downgrading is now prevented. If a user would like to downgrade a
version, he/she must uninstall the newer version first.
Signed-off-by: Leonid Bloch <address@hidden>
---
qga/installer/qemu-ga.wxs | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index 2302745..41b11cf 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -58,13 +58,9 @@
/>
<Media Id="1" Cabinet="qemu_ga.$(env.QEMU_GA_VERSION).cab" EmbedCab="yes"
/>
<Property Id="WHSLogo">1</Property>
- <Property Id="PREVIOUSVERSIONSINSTALLED" />
- <Upgrade Id="{EB6B8302-C06E-4bec-ADAC-932C68A3A98D}">
- <UpgradeVersion
- Minimum="1.0.0.0" Maximum="$(env.QEMU_GA_VERSION)"
- Property="PREVIOUSVERSIONSINSTALLED"
- IncludeMinimum="yes" IncludeMaximum="no" />
- </Upgrade>
+ <MajorUpgrade
+ DowngradeErrorMessage="Error: A newer version of QEMU guest agent is
already installed."
+ />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.GaProgramFilesFolder)" Name="QEMU Guest Agent">
@@ -125,6 +121,7 @@
</Directory>
<Property Id="cmd" Value="cmd.exe"/>
+ <Property Id="REINSTALLMODE" Value="amus"/>
<?ifdef var.InstallVss?>
<CustomAction Id="RegisterCom"
@@ -160,10 +157,9 @@
</Feature>
<InstallExecuteSequence>
- <RemoveExistingProducts Before="InstallInitialize" />
<?ifdef var.InstallVss?>
- <Custom Action="RegisterCom" After="InstallServices">NOT
Installed</Custom>
<Custom Action="UnRegisterCom" After="StopServices">Installed</Custom>
+ <Custom Action="RegisterCom" After="InstallServices">NOT REMOVE</Custom>
<?endif?>
</InstallExecuteSequence>
</Product>
--
2.4.3
- [Qemu-devel] [PATCH v3 0/4] qemu-ga: Fixes to the QEMU GA MSI installer, Leonid Bloch, 2015/08/03
- [Qemu-devel] [PATCH v3 1/4] qemu-ga: Fixed GUID capitalization, Leonid Bloch, 2015/08/03
- [Qemu-devel] [PATCH v3 3/4] qemu-ga: Created a separate component for each installed file in the MSI, Leonid Bloch, 2015/08/03
- [Qemu-devel] [PATCH v3 2/4] qemu-ga: Minor cosmetic changes to the WXS file, Leonid Bloch, 2015/08/03
- [Qemu-devel] [PATCH v3 4/4] qemu-ga: Prevent QEMU-GA VSS provider from being unregistered on MSI reinstall,
Leonid Bloch <=
- Re: [Qemu-devel] [PATCH v3 0/4] qemu-ga: Fixes to the QEMU GA MSI installer, Michael Roth, 2015/08/25
- Re: [Qemu-devel] [PATCH v3 0/4] qemu-ga: Fixes to the QEMU GA MSI installer, Michael Roth, 2015/08/26