Changeset 92114 in vbox for trunk/src

Timestamp:

Oct 27, 2021 8:21:09 PM (3 years ago)

Author:

vboxsync

Message:

Installer/darwin/VBoxKEXTs/VirtualBoxStartup.sh: Generalize the different Big Sur handling to Bug Sur and later

File:

• trunk/src/VBox/Installer/darwin/VBoxKEXTs/VirtualBoxStartup.sh (modified) (4 diffs)

trunk/src/VBox/Installer/darwin/VBoxKEXTs/VirtualBoxStartup.sh

@@ -71 +71 @@
     VBOXDRV="VBoxDrv"
     VBOXUSB="VBoxUSB"
-    MACOS_VERS=$(sw_vers -productVersion)
+    MACOS_VERSION_MAJOR=$(sw_vers -productVersion | /usr/bin/sed -e 's/^\([0-9]*\).*$/\1/')
 
     #
@@ -98 +98 @@
     #
     if [ $VBOX_RC -eq 0 ]; then
-        if [[ ${MACOS_VERS} != 11.* ]]; then
+        if [[ ${MACOS_VERSION_MAJOR} -lt 11 ]]; then
             if kextstat -lb org.virtualbox.kext.VBoxDrv 2>&1 | grep -q org.virtualbox.kext.VBoxDrv; then
                 ConsoleMessage "Error: ${VBOXDRV}.kext is already loaded"
@@ -143 +143 @@
     #
     if [ $VBOX_RC -eq 0 ]; then
-        if [[ ${MACOS_VERS} != 11.* ]]; then
+        if [[ ${MACOS_VERSION_MAJOR} -lt 11 ]]; then
             ConsoleMessage "Loading ${VBOXDRV}.kext"
             if ! kextload "/Library/Application Support/VirtualBox/${VBOXDRV}.kext"; then
@@ -221 +221 @@
     VBOXDRV="VBoxDrv"
     VBOXUSB="VBoxUSB"
-    MACOS_VERS=$(sw_vers -productVersion)
-
-    if [[ ${MACOS_VERS} != 11.* ]]; then
+    MACOS_VERSION_MAJOR=$(sw_vers -productVersion | /usr/bin/sed -e 's/^\([0-9]*\).*$/\1/')
+
+    if [[ ${MACOS_VERSION_MAJOR} -lt 11 ]]; then
         if kextstat -lb org.virtualbox.kext.VBoxUSB 2>&1 | grep -q org.virtualbox.kext.VBoxUSB; then
             ConsoleMessage "Unloading ${VBOXUSB}.kext"