Changeset 47882 in vbox

Timestamp:

Aug 20, 2013 9:55:57 AM (11 years ago)

Author:

vboxsync

Message:

Installer/solaris: Adding VBoxNetLwipNAT (analogy with VBoxNetDHCP, not tested)

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• checkinstall.sh (modified) (1 diff)
• makepackage.sh (modified) (1 diff)
• vboxconfig.sh (modified) (1 diff)

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

@@ -210 +210 @@
         $(if $(VBOX_WITH_NETADP),VBoxNetAdpCtl,) \
         VBoxNetDHCP \
+        VBoxNetLwipNAT \
         $(if $(VBOX_WITH_EXTPACK),VBoxExtPackHelperApp,) \
         VBoxSVC \
@@ -269 +270 @@
 SOLARIS_STRIP_BINS += \
         VBoxNetDHCP.so \
+        VBoxNetLwipNAT.so \
         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL.so,) \
         $(if $(VBOX_WITH_QTGUI),VirtualBox.so,)

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

@@ -160 +160 @@
 if test ! -z "$VBOXNETDHCP_PID" && test "$VBOXNETDHCP_PID" -ge 0; then
     errorprint "VirtualBox's VBoxNetDHCP (pid $VBOXNETDHCP_PID) still appears to be running."
+    abort_error
+fi
+
+# Check if VBoxNetLwipNAT is currently running
+VBOXNETLWIPNAT_PID=`ps -eo pid,fname | grep VBoxNetLwipNAT | grep -v grep | awk '{ print $1 }'`
+if test ! -z "$VBOXNETLWIPNAT_PID" && test "$VBOXNETLWIPNAT_PID" -ge 0; then
+    errorprint "VirtualBox's VBoxNetLwipNAT (pid $VBOXNETLWIPNAT_PID) still appears to be running."
     abort_error
 fi

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

@@ -206 +206 @@
         ||  $3 == "opt/VirtualBox/amd64/VBoxNetDHCP" \
         ||  $3 == "opt/VirtualBox/i386/VBoxNetDHCP" \
+        ||  $3 == "opt/VirtualBox/amd64/VBoxNetLwipNAT" \
+        ||  $3 == "opt/VirtualBox/i386/VBoxNetLwipNAT" \
         ) \
    { $4 = "4755" } { print }' prototype > prototype2

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

@@ -960 +960 @@
     # Stop our other daemons, non-fatal
     stop_process "VBoxNetDHCP"
+    stop_process "VBoxNetLwipNAT"
 
    # Stop VBoxSVC quickly using SIGUSR1