Adding upstream version 6.0.4-dfsg.upstream/6.0.4-dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 64 insertions, 0 deletions

diff --git a/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi b/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi
new file mode 100644
index 00000000..a080055c
--- /dev/null
+++ b/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+    VirtualBox Windows Installation Script (WiX)
+
+    Copyright (C) 2006-2016 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+-->
+
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
+         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
+
+<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
+    <!-- Create host-only interfaces on first-time install -->
+    <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[(NOT Installed) AND ($cp_NetAdpDriver=3)]]>
+        <?else ?>
+            <![CDATA[(NOT Installed) AND ($cp_NetAdpDriver=3)]]>
+        <?endif ?>
+    </Custom>
+    <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[(NOT Installed) AND ($cp_NetAdpDriver=3)]]>
+        <?else ?>
+            <![CDATA[(NOT Installed) AND ($cp_NetAdpDriver=3)]]>
+        <?endif ?>
+    </Custom>
+    <!-- Remove the host-only interfaces on uninstall only. Includes
+         VBoxNetAdp 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_RemoveHostOnlyInterfaces" After="InstallInitialize" >
+        <![CDATA[NOT (UPGRADINGPRODUCTCODE) AND (Installed) AND (REMOVE="ALL")]]>
+    </Custom>
+    <!-- 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_StopHostOnlyInterfaces" After="InstallInitialize" >
+        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+    </Custom>
+
+    <!-- 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_UninstallNetAdpArgs" Before="ca_UninstallNetAdp" >
+        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+    </Custom>
+    <Custom Action="ca_UninstallNetAdp" After="ca_StopHostOnlyInterfaces" >
+        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+    </Custom>
+
+<?endif ?>
+
+</Include>