Changeset 66385 in vbox for trunk/src/VBox/Installer/win/VBoxMergeNetAdp6Seq.wxi

Timestamp:

Mar 31, 2017 3:44:14 PM (8 years ago)

Author:

vboxsync

Message:

Installer/win: Full circle, go back to the original VBoxNet{Adp,Adp6} custom action conditions. They are correct, because the install helper functions are doing very strange and inconsistent things. Some comments were misleading or wrong, this is now fixed.

File:

• trunk/src/VBox/Installer/win/VBoxMergeNetAdp6Seq.wxi (modified) (1 diff)

trunk/src/VBox/Installer/win/VBoxMergeNetAdp6Seq.wxi

@@ -33 +33 @@
         <?endif ?>
     </Custom>
-    <!-- Don't remove the host-only interfaces on update, only on uninstall -->
+    <!-- Remove the host-only interfaces on uninstall only. Includes
+         VBoxNetAdp6 driver uninstall.
+         @todo r=klaus Clean up this inconsistency by changing what the
+         install helper DLL does. It's very surprising behavior and needs
+         digging through a lot of code to understand the where and why. -->
     <Custom Action="ca_RemoveHostOnlyInterfacesNDIS6" After="InstallInitialize" >
         <![CDATA[NOT (UPGRADINGPRODUCTCODE) AND (Installed) AND (REMOVE="ALL")]]>
     </Custom>
-    <!-- First stop the existing host-only interfaces on update ... -->
+    <!-- Stop the host-only interfaces on update only. Driver still has to be
+         uninstalled, and the creation of interfaces in the new installer will
+         do the actual upgrading, preserving the interfaces. -->
     <Custom Action="ca_StopHostOnlyInterfacesNDIS6" After="InstallInitialize" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
     </Custom>
 
-    <!-- Finally uninstall the driver, but only on package uninstall -->
+    <!-- Uninstall the driver only on package upgrade, as for uninstall it is
+         included in ca_RemoveHostOnlyInterfaces.
+         @todo r=klaus Clean up this inconsistency by changing what the
+         install helper DLL does. It's very surprising behavior and needs
+         digging through a lot of code to understand the where and why. -->
     <Custom Action="ca_UninstallNetAdp6Args" Before="ca_UninstallNetAdp6" >
-        <![CDATA[NOT (UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
     </Custom>
     <Custom Action="ca_UninstallNetAdp6" After="ca_StopHostOnlyInterfacesNDIS6" >
-        <![CDATA[NOT (UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
     </Custom>