Changeset 89576 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 9, 2021 10:32:41 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145013

Message:

Main: bugref:9948: Fixed GA installation on MacOS Catalina

Location:

trunk/src/VBox/Additions/darwin/Installer

Files:

• VBoxGuestAdditionsKEXTs/postflight (modified) (2 diffs)
• VBoxGuestAdditionsToolsAndServices/VBoxServiceWrapper (modified) (1 diff)

trunk/src/VBox/Additions/darwin/Installer/VBoxGuestAdditionsKEXTs/postflight

@@ -47 +47 @@
 
 unload_service "org.virtualbox.additions.vboxservice" "/Library/LaunchDaemons" "root"
-unload_service "org.virtualbox.additions.vboxclient" "/Library/LaunchAgents" "${USER}"
+
+# Remove the old service for all users
+for user in $(dscl . -list /Users | grep -v -e'^_' -e'root'); do
+    system_user="YES"
+    test -n "$(dscl . -read /Users/$user NFSHomeDirectory | grep '/Users')" && system_user="NO"
+    if [ "$system_user" = "NO" ]; then 
+        unload_service "org.virtualbox.additions.vboxclient" "/Library/LaunchAgents" "$user"
+    fi
+done
 
 items="VBoxGuest"
@@ -72 +80 @@
 
 load_service "org.virtualbox.additions.vboxservice" "/Library/LaunchDaemons" "root"
-load_service "org.virtualbox.additions.vboxclient" "/Library/LaunchAgents" "${USER}"
+# Add VBoxClient for all currently defined users
+for user in $(dscl . -list /Users | grep -v -e'^_' -e'root'); do
+    system_user="YES"
+    test -n "$(dscl . -read /Users/$user NFSHomeDirectory | grep '/Users')" && system_user="NO"
+    if [ "$system_user" = "NO" ]; then 
+        load_service "org.virtualbox.additions.vboxclient" "/Library/LaunchAgents" "$user"
+    fi
+done
 
 echo "Warning: If VBoxService adjusts the time backwards (because of --biossystemtimeoffset), the installer may hang."

trunk/src/VBox/Additions/darwin/Installer/VBoxGuestAdditionsToolsAndServices/VBoxServiceWrapper

@@ -36 +36 @@
 done
 
+echo "Check if VBoxClient is added for all non-system users"
+for user in $(dscl . -list /Users | grep -v -e'^_' -e'root'); do
+    system_user="YES"
+    test -n "$(dscl . -read /Users/$user NFSHomeDirectory | grep '/Users')" && system_user="NO"
+    if [ "$system_user" = "NO" ]; then
+        loaded="NO"
+        test -n "$(sudo -u "$user" launchctl list | grep 'org.virtualbox.additions.vboxclient')" && loaded="YES"
+        if [ "$loaded" = "NO" ] ; then
+            echo "Loading org.virtualbox.additions.vboxclient for $user"
+            sudo -u "$user" launchctl load -F "/Library/LaunchAgents/org.virtualbox.additions.vboxclient.plist"
+        fi
+    fi
+done
+
 exec "/Library/Application Support/VirtualBox Guest Additions/VBoxService" -f