Changeset 72752 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Jun 29, 2018 8:20:14 AM (6 years ago)

Author:

vboxsync

Message:

Installer/solaris: Try to fix version detection for newer Solaris versions and make them use ipadm approach of adapter configs.

File:

• trunk/src/VBox/Installer/solaris/vboxconfig.sh (modified) (6 diffs)

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

@@ -237 +237 @@
 }
 
-# get_s11_4_or_newer_sysinfo()
+# get_s11_4_sysinfo()
 # cannot fail
-get_s11_4_or_newer_sysinfo()
+get_s11_4_sysinfo()
 {
     # See check in plumb_net for why this is > 174. The alternative is we declare 11.4+ as S12 with
@@ -246 +246 @@
     HOST_OS_MAJORVERSION="11"
     HOST_OS_MINORVERSION="175"
+}
+
+# get_s11_5_or_newer_sysinfo()
+# cannot fail
+get_s11_5_or_newer_sysinfo()
+{
+    # See check in plumb_net for why this is 176.
+    HOST_OS_MAJORVERSION="11"
+    HOST_OS_MINORVERSION="176"
 }
 
@@ -259 +268 @@
             return 0
             ;;
-        # Quick escape workaround for Solaris 11.4+, changes the pkg FMRI (yet again). See BugDB #26494983.
-        11.4.* | 11.5.*)
-        get_s11_4_or_newer_sysinfo
-        return 0
+        # Quick escape workaround for Solaris 11.4, changes the pkg FMRI (yet again). See BugDB #26494983.
+        11.4.*)
+            get_s11_4_sysinfo
+            return 0
+        # Quick escape workaround for Solaris 11.5. See BugDB #26494983.
+        11.5.*)
+            get_s11_5_or_newer_sysinfo
+            return 0
     esac
 
@@ -994 +1007 @@
 plumb_net()
 {
-    # S11 175a renames vboxnet0 as 'netX', undo this and rename it back (S12+ or S11 b175+)
-    if test "$HOST_OS_MAJORVERSION" -gt 11 || (test "$HOST_OS_MAJORVERSION" -eq 11 && test "$HOST_OS_MINORVERSION" -gt 174); then
+    # S11 175a renames vboxnet0 as 'netX', undo this and rename it back (Solaris 12, Solaris 11.4 or newer)
+    if test "$HOST_OS_MAJORVERSION" -ge 12 || (test "$HOST_OS_MAJORVERSION" -eq 11 && test "$HOST_OS_MINORVERSION" -ge 175); then
         vanityname=`dladm show-phys -po link,device | grep vboxnet0 | cut -f1 -d':'`
         if test "$?" -eq 0 && test ! -z "$vanityname" && test "x$vanityname" != "xvboxnet0"; then
@@ -1005 +1018 @@
     fi
 
-    # use ipadm for Solaris 12 and newer
-    if test "$HOST_OS_MAJORVERSION" -ge 12; then
+    # use ipadm for Solaris 12, Solaris 11.5 or newer
+    if test "$HOST_OS_MAJORVERSION" -ge 12 || (test "$HOST_OS_MAJORVERSION" -eq 11 && test "$HOST_OS_MINORVERSION" -ge 176); then
         $BIN_IPADM create-ip vboxnet0
         if test "$?" -eq 0; then
@@ -1086 +1099 @@
 {
     inst=0
-    # use ipadm for Solaris 12 and newer
-    if test "$HOST_OS_MAJORVERSION" -ge 12; then
+    # use ipadm for Solaris 12, Solaris 11.5 or newer
+    if test "$HOST_OS_MAJORVERSION" -ge 12 || (test "$HOST_OS_MAJORVERSION" -eq 11 && test "$HOST_OS_MINORVERSION" -ge 176); then
         while test "$inst" -ne $MOD_VBOXNET_INST; do
             vboxnetup=`$BIN_IPADM show-addr -p -o addrobj vboxnet$inst >/dev/null 2>&1`