Changeset 72294 in vbox for trunk/src/VBox/Installer

Timestamp:

May 23, 2018 11:17:08 AM (7 years ago)

Author:

vboxsync

Message:

Installer/solaris: Added a Solaris version, fixed tabs to spaces.

File:

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

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

@@ -237 +237 @@
 }
 
-# get_s11_4_sysinfo()
+# get_s11_4_or_newer_sysinfo()
 # cannot fail
-get_s11_4_sysinfo()
-{
-    # See check in plumb_net for why this is > 174. The alternative is we declare 11.4 as S12 with
+get_s11_4_or_newer_sysinfo()
+{
+    # See check in plumb_net for why this is > 174. The alternative is we declare 11.4+ as S12 with
     # a more accurate minor (build) version number. For now this is sufficient to workaround the ever
     # changing version numbering policy.
@@ -254 +254 @@
     STR_OSVER=`uname -v`
     case "$STR_OSVER" in
-        # First check 'uname -v' and weed out the recognized, unofficial distros of Solaris
+    # First check 'uname -v' and weed out the recognized, unofficial distros of Solaris
         omnios*|oi_*|illumos*)
             get_unofficial_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.4+, changes the pkg FMRI (yet again). See BugDB #26494983.
+        11.4.* | 11.5.*)
+        get_s11_4_or_newer_sysinfo
+        return 0
     esac
 
@@ -1211 +1211 @@
         if test "$HOST_OS_MAJORVERSION" -eq 10; then
             for lib in `ls -1 /opt/VirtualBox/legacy/`; do
-               /usr/sbin/installf -c none $PKGINST /opt/VirtualBox/$lib=legacy/$lib s
+            /usr/sbin/installf -c none $PKGINST /opt/VirtualBox/$lib=legacy/$lib s
             done
             for lib in `ls -1 /opt/VirtualBox/amd64/legacy/`; do