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

時間撮記:

2013-8-20 上午11:37:09 (11 年 以前)

作者:

vboxsync

訊息:

VBoxNetLwipNAT => VBoxNetNAT

位置:

trunk/src/VBox/Installer/solaris

檔案:

• Makefile.kmk (修改) (2 筆差異)
• checkinstall.sh (修改) (1 筆差異)
• makepackage.sh (修改) (1 筆差異)
• vboxconfig.sh (修改) (1 筆差異)

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

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

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

@@ -163 +163 @@
 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."
+# Check if VBoxNetNAT is currently running
+VBOXNETNAT_PID=`ps -eo pid,fname | grep VBoxNetNAT | grep -v grep | awk '{ print $1 }'`
+if test ! -z "$VBOXNETNAT_PID" && test "$VBOXNETNAT_PID" -ge 0; then
+    errorprint "VirtualBox's VBoxNetNAT (pid $VBOXNETNAT_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" \
+        ||  $3 == "opt/VirtualBox/amd64/VBoxNetNAT" \
+        ||  $3 == "opt/VirtualBox/i386/VBoxNetNAT" \
         ) \
    { $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_process "VBoxNetNAT"
 
    # Stop VBoxSVC quickly using SIGUSR1