vbox的更動 11923 路徑 trunk/src/VBox/Installer/solaris

時間撮記:

2008-9-1 下午02:59:41 (16 年 以前)

作者:

vboxsync

訊息:

Solaris/installer: Added the bits for vboxnetflt.

位置:

trunk/src/VBox/Installer/solaris

檔案:

• Makefile.kmk (修改) (7 筆差異)
• makepackage.sh (修改) (1 筆差異)
• postinstall.sh (修改) (2 筆差異)
• vboxdrv.sh (修改) (4 筆差異)

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

@@ -69 +69 @@
 SOLARIS_STRIP_BINS = \
         vboxdrv \
+        $(if $(VBOX_WITH_NETFLT),vboxflt) \
         $(if $(VBOX_WITH_VBOXBFE),VBoxBFE) \
         VBoxDD.so \
@@ -136 +137 @@
         autoresponse \
         vboxdrv.conf \
+        $(if $(VBOX_WITH_NETFLT),vboxflt.conf) \
         vboxdrv.sh \
         VBox.sh \
@@ -229 +231 @@
                 $(if $(and $(not $(VBOX_OSE)),$(VBOX_WITH_QT4GUI)),$(PATH_BIN)/License-$(VBOX_LICENSE_VER).html) \
                 $(PATH_ROOT)/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf \
+                $(if $(VBOX_WITH_NETFLT),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf) \
                 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh \
                 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh \
@@ -241 +244 @@
         $(QUIET)$(if $(VBOX_WITH_VRDP_RDESKTOP),$(MKDIR) -p $(SOLARIS_INST_DIR)/rdesktop-vrdp-keymaps,)
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/vboxdrv                                                          $(SOLARIS_INST_DIR)/vboxdrv
+        $(QUIET)$(if $(VBOX_WITH_NETFLT),$(INSTALL) -m 0644 $(PATH_BIN)/vboxflt                                 $(SOLARIS_INST_DIR)/vboxflt,)
         $(QUIET)$(if $(VBOX_WITH_VBOXBFE),$(INSTALL) -m 0755 $(PATH_BIN)/VBoxBFE                                $(SOLARIS_INST_DIR)/VBoxBFE)
 ifdef VBOX_WITH_HARDENING
@@ -291 +295 @@
         $(call MSG_L1,Stripping binaries $(SOLARIS_INST_DIR))
         $(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARIS_INST_DIR)/vboxdrv,)
+ifdef VBOX_WITH_NETFLT
+        $(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARIS_INST_DIR)/vboxflt,)
+endif
         $(QUIET)$(if $(VBOX_DO_STRIP),$(if $(VBOX_WITH_VBOXBFE),strip $(SOLARIS_INST_DIR)/VBoxBFE,))
 ifdef VBOX_WITH_HARDENING
@@ -350 +357 @@
                 $(PATH_CURRENT)/vbox.pkginfo
         $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf               $(SOLARIS_INST_DIR)/vboxdrv.conf
+        $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf            $(SOLARIS_INST_DIR)/vboxflt.conf
         $(QUIET)$(if $(and $(not $(VBOX_OSE)),$(VBOX_WITH_DOCS)),$(INSTALL) -m 0644 $(PATH_BIN)/UserManual.pdf  $(SOLARIS_INST_DIR)/UserManual.pdf,)
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_INST_DIR)/LICENSE)
@@ -429 +437 @@
         $(QUIET)$(MKDIR) -p -- $(SOLARIS_DBG_DIR)/components
         $(QUIET)$(SOL_DBG_OBJCOPY) $(PATH_BIN)/vboxdrv                                                            $(SOLARIS_DBG_DIR)/vboxdrv
+        $(QUIET)$(SOL_DBG_OBJCOPY) $(PATH_BIN)/vboxflt                                                            $(SOLARIS_DBG_DIR)/vboxflt
         $(QUIET)$(if $(VBOX_WITH_VBOXBFE),$(SOL_DBG_OBJCOPY) $(PATH_BIN)/VBoxBFE                                  $(SOLARIS_DBG_DIR)/VBoxBFE)
 ifdef VBOX_WITH_HARDENING

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

@@ -101 +101 @@
 fi
 
+# install vboxflt to the right place.
+if test "$3" = "x86"; then
+    filelist_fixup prototype '$3 == "opt/VirtualBox/vboxflt=vboxflt"'                                   '$3 = "platform/i86pc/kernel/drv/vboxflt=vboxflt"; $6 = "sys"'
+else
+    filelist_fixup prototype '$3 == "opt/VirtualBox/vboxflt=vboxflt"'                                   '$3 = "platform/i86pc/kernel/drv/amd64/vboxflt=vboxflt"; $6 = "sys"'
+fi
+
 filelist_fixup prototype '$3 == "opt/VirtualBox/vboxdrv.conf=vboxdrv.conf"'                             '$3 = "platform/i86pc/kernel/drv/vboxdrv.conf=vboxdrv.conf"'
+
+filelist_fixup prototype '$3 == "opt/VirtualBox/vboxflt.conf=vboxflt.conf"'                             '$3 = "platform/i86pc/kernel/drv/vboxflt.conf=vboxflt.conf"'
 
 # hardening requires some executables to be marked setuid.

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

@@ -32 +32 @@
     echo "Configuring VirtualBox kernel module..."
     /opt/VirtualBox/vboxdrv.sh restart silentunload
+    
+    echo "Configuring VirtualBox NetFilter kernel module..."
+    if test -f /platform/i86pc/kernel/drv/vboxflt.conf; then
+        /opt/VirtualBox/vboxdrv.sh fltrestart silentunload
+    fi
 fi
 
@@ -69 +74 @@
     /usr/sbin/devfsadm -i vboxdrv
 fi
-    
+
 echo "Done."
 

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

@@ -20 +20 @@
 SILENTUNLOAD=""
 MODNAME="vboxdrv"
+FLTMODNAME="vboxflt"
 MODDIR32="/platform/i86pc/kernel/drv"
 MODDIR64=$MODDIR32/amd64
@@ -53 +54 @@
     else
         loadentry=`/usr/sbin/modinfo | grep $MODNAME`
+    fi
+    if test -z "$loadentry"; then
+        return 1
+    fi
+    return 0
+}
+
+vboxflt_module_loaded()
+{
+    if test -f "/etc/name_to_major"; then
+        loadentry=`cat /etc/name_to_major | grep $FLTMODNAME`
+    else
+        loadentry=`/usr/sbin/modinfo | grep $FLTMODNAME`
     fi
     if test -z "$loadentry"; then
@@ -111 +125 @@
 }
 
+start_vboxflt()
+{
+    if vboxflt_module_loaded; then
+        info "VirtualBox Net Filter kernel module already loaded."
+    else
+        if test -n "_HARDENED_"; then
+            /usr/sbin/add_drv -m'* 0600 root sys' $FLTMODNAME
+        else
+            /usr/sbin/add_drv -m'* 0666 root sys' $FLTMODNAME
+        fi
+        /usr/sbin/modload -p drv/$FLTMODNAME
+        if test ! vboxflt_module_loaded; then
+            abort "## Failed to load VirtualBox Net Filter kernel module."
+        elif
+            info "VirtualBox Net Filter kernel module loaded."
+        fi
+    fi
+}
+
+stop_vboxflt()
+{
+    if vboxflt_module_loaded; then
+        /usr/sbin/rem_drv $FLTMODNAME || abort "## Failed to unload VirtualBox Net Filter module."
+        info "VirtualBox Net Filter kernel module unloaded."
+    elif test -z "$SILENTUNLOAD"; then
+        info "VirtualBox Net Filter kernel module not loaded."
+    fi
+}
+
+restart_vboxflt()
+{
+    stop_vboxflt
+    sync
+    start_vboxflt
+    return 0
+}
+
 status_module()
 {
@@ -140 +191 @@
     status_module
     ;;
+fltrestart)
+    restart_vboxflt
+    ;;
 *)
-    echo "Usage: $0 {start|stop|restart|status}"
+    echo "Usage: $0 {start|stop|restart|status|fltrestart}"
     exit 1
 esac