1 files changed, 11 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
index 48430389..5819e9de 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
@@ -46,10 +46,15 @@ ExceptionSetInitialDelay=101
 ExceptionSetDelay=102
 ExceptionVNC=103
 ExceptionNTS=104
+ExceptionDisableScreensaverPassword=105
 
 try
 (
     echo "Disable Screensaver"
+    # For current session
+    defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver
+
+    # For session after a reboot
     mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver
     (
         cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
@@ -78,6 +83,8 @@ try
 EOT
     ) || throw $ExceptionDisableScreensaver
 
+    defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword
+
     echo "Set keyboard type rates and delays"
     # normal minimum is 15 (225 ms)
     defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay
@@ -113,5 +120,9 @@ catch || {
             echo "Failed to set NTS."
             exit 1;
         ;;
+        $ExceptionDisableScreensaverPassword)
+            echo "Failed to disable requiring of password after screensaver is enabled."
+            exit 1;
+        ;;
     esac
 }