Changeset 51225 in vbox for trunk/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi

Timestamp:

May 9, 2014 1:08:07 PM (11 years ago)

Author:

vboxsync

Message:

Windows host installer: Fixes for non-MSM builds.

File:

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

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

@@ -19 +19 @@
 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
     <!-- Create host-only interfaces on first-time install -->
-    <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" ><![CDATA[NOT Installed]]></Custom>
-    <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[NOT Installed]]></Custom>
+    <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[NOT Installed]]>
+        <?else ?>
+            <![CDATA[&VBoxNetworkAdp=3]]>
+        <?endif ?>
+    </Custom>
+    <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[NOT Installed]]>
+        <?else ?>
+            <![CDATA[&VBoxNetworkAdp=3]]>
+        <?endif ?>
+    </Custom>
     <!-- Don't remove the host-only interfaces on update, only on uninstall -->
     <Custom Action="ca_RemoveHostOnlyInterfaces" Before="InstallFinalize" ><![CDATA[(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]></Custom>