Changeset 37328 in vbox

Timestamp:

Jun 6, 2011 11:50:47 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

72085

Message:

Solaris/Installer: install NetBow driver with explicit, optional STREAMS driver fallback for newer systems.

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/solaris/vboxbow.conf (copied) (copied from trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf ) (2 diffs)
• Installer/solaris/Makefile.kmk (modified) (4 diffs)
• Installer/solaris/makepackage.sh (modified) (1 diff)
• Installer/solaris/vboxconfig.sh (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxbow.conf

@@ -1 +1 @@
 #
-# Solaris Host VBoxFlt Configuration
+# Solaris Host VBoxFlt (Crossbow) Configuration
 #
 # Copyright (C) 2008-2010 Oracle Corporation
@@ -18 +18 @@
 # directory).
 #
-name="vboxflt" parent="pseudo" instance=0;
+name="vboxbow" parent="pseudo" instance=0;
 
-# If the interface being used does not have IPv6 plumbed and you want
-# vboxflt to automatically attach to it by checking for Ipv6 stream every
-# "ipv6-pollinterval" seconds.
-#
-# By default this is disabled meaning if the interface does not have Ipv6
-# plumbed when the virtual machine starts, guest<->host Ipv6 will not work
-# though guest<->remote Ipv6 would work.
-#
-# Enable if you have a dynamically plumbing/unplumbing Ipv6 interface for
-# which you want vboxflt to adjust accordingly, otherwise keep this disabled.
-# Enabling this option will have some minor performance penalty.
-#ipv6-pollinterval=3;
-

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -166 +166 @@
         $(PATH_ROOT)/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf \
         $(if $(VBOX_WITH_NETFLT),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf) \
+        $(if $(VBOX_WITH_NETFLT_CROSSBOW),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxbow.conf) \
         $(if $(VBOX_WITH_NETADP),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/vboxnet.conf) \
         $(if $(VBOX_WITH_USB),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusbmon.conf) \
@@ -218 +219 @@
         vboxdrv \
         $(if $(VBOX_WITH_NETFLT),vboxflt,) \
+        $(if $(VBOX_WITH_NETFLT_CROSSBOW),vboxbow,) \
         $(if $(VBOX_WITH_NETADP),vboxnet,) \
         $(if $(VBOX_WITH_USB),vboxusbmon,) \
@@ -225 +227 @@
         vboxdrv.conf \
         $(if $(VBOX_WITH_NETFLT),vboxflt.conf,) \
+        $(if $(VBOX_WITH_NETFLT_CROSSBOW),vboxbow.conf,) \
         $(if $(VBOX_WITH_NETADP),vboxnet.conf,) \
         $(if $(VBOX_WITH_USB),vboxusbmon.conf,) \
@@ -637 +640 @@
         $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop.tmp                            $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop
         $(QUIET)$(RM) -f $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop.tmp
-        # S10 cannot deal with icon information in virtrtualbox.xml
+        # S10 cannot deal with icon information in virtualbox.xml
         $(QUIET)$(SED) \
                 -e '/<icon/d' \

trunk/src/VBox/Installer/solaris/makepackage.sh

@@ -162 +162 @@
 filelist_fixup prototype '$3 == "platform/i86pc/kernel/drv/vboxflt"'                                   '$6 = "sys"'
 filelist_fixup prototype '$3 == "platform/i86pc/kernel/drv/amd64/vboxflt"'                             '$6 = "sys"'
+
+# NetFilter vboxbow
+filelist_fixup prototype '$3 == "platform/i86pc/kernel/drv/vboxbow"'                                   '$6 = "sys"'
+filelist_fixup prototype '$3 == "platform/i86pc/kernel/drv/amd64/vboxbow"'                             '$6 = "sys"'
 
 # NetAdapter vboxnet

trunk/src/VBox/Installer/solaris/vboxconfig.sh

@@ -53 +53 @@
 
 MOD_VBOXFLT=vboxflt
-DESC_VBOXFLT="NetFilter"
+DESC_VBOXFLT="NetFilter (STREAMS)"
+
+MOD_VBOXBOW=vboxbow
+DESC_VBOXBOW="NetFilter (Crossbow)"
 
 # No Separate VBI since (3.1)
@@ -491 +494 @@
     fi
 
-    # Load VBoxNetFlt
-    if test -f "$DIR_CONF/vboxflt.conf"; then
-        add_driver "$MOD_VBOXFLT" "$DESC_VBOXFLT" "$FATALOP"
-        load_module "drv/$MOD_VBOXFLT" "$DESC_VBOXFLT" "$FATALOP"
+    # If vboxinst_vboxflt exists or if host is Solaris 10 or S11 versions < snv_159 then load vboxflt driver.
+    if test -f /etc/vboxinst_vboxflt || test "$HOST_OS_MAJORVERSION" = "5.10" || test "$HOST_OS_MINORVERSION" -lt 159;  then
+        # Load VBoxNetFlt
+        if test -f "$DIR_CONF/vboxflt.conf"; then
+            add_driver "$MOD_VBOXFLT" "$DESC_VBOXFLT" "$FATALOP"
+            load_module "drv/$MOD_VBOXFLT" "$DESC_VBOXFLT" "$FATALOP"
+        fi
+    else
+        # Load VBoxNetBow
+        if test -f "$DIR_CONF/vboxbow.conf"; then
+            add_driver "$MOD_VBOXBOW" "$DESC_VBOXBOW" "$FATALOP"
+            load_module "drv/$MOD_VBOXBOW" "$DESC_VBOXBOW" "$FATALOP"
+        fi
     fi
 
@@ -568 +580 @@
     unload_module "$MOD_VBOXFLT" "$DESC_VBOXFLT" "$fatal"
     rem_driver "$MOD_VBOXFLT" "$DESC_VBOXFLT" "$fatal"
+
+    unload_module "$MOD_VBOXBOW" "$DESC_VBOXBOW" "$fatal"
+    rem_driver "$MOD_VBOXBOW" "$DESC_VBOXBOW" "$fatal"
 
     unload_module "$MOD_VBOXNET" "$DESC_VBOXNET" "$fatal"