[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/26] qemu-ga: Prevent QEMU-GA VSS provider from be
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 06/26] qemu-ga: Prevent QEMU-GA VSS provider from being unregistered on MSI reinstall |
Date: |
Tue, 1 Sep 2015 12:00:46 -0500 |
From: Leonid Bloch <address@hidden>
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>
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael Roth <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 b32064e..c195b4b 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"
@@ -161,10 +158,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>
--
1.9.1
- Re: [Qemu-devel] [PULL 00/26] qemu-ga patch queue for 2015-09-01, (continued)
- [Qemu-devel] [PATCH 24/26] configure: qemu-ga: explicitly enable qemu-ga MSI support when probed, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 26/26] Makefile: qemu-ga: fix msi target error message, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 04/26] qemu-ga: Minor cosmetic changes to the WXS file, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 02/26] qemu-ga: Two MSI related cosmetic changes, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 05/26] qemu-ga: Created a separate component for each installed file in the MSI, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 03/26] qemu-ga: Fixed GUID capitalization, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 06/26] qemu-ga: Prevent QEMU-GA VSS provider from being unregistered on MSI reinstall,
Michael Roth <=
- [Qemu-devel] [PATCH 07/26] qemu-ga: Fixed paths issue with MSI build, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 08/26] configure: qemu-ga: report MSI install support in summary, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 25/26] build: qemu-ga: fix VSS dependencies, Michael Roth, 2015/09/01