Update variables.pkrvars.hcl

Co-authored-by: Melvin Gundlach <mgundlach@it-economics.de>

README.md

@@ -10,24 +10,20 @@ See a full list of VMs available on Cirrus CI [here](https://github.com/orgs/cir
 
 ## Building Vanilla Image
 
-To build `macos-monterey-vanilla`:
-
-```bash
-packer build templates/vanilla-monterey.pkr.hcl
-```
-
 To build `macos-ventura-vanilla`:
 
 ```bash
 packer build templates/vanilla-ventura.pkr.hcl
 ```
 
-Optionally, SIP can be disabled for each image by running the following commands:
+To build `macos-sonoma-vanilla`:
 
 ```bash
-packer build -var vm_name=monterey-vanilla templates/disable-sip.pkr.hcl
+packer build templates/vanilla-sonoma.pkr.hcl
 ```
 
+Optionally, SIP can be disabled for each image by running the following commands:
+
 ```bash
 packer build -var vm_name=ventura-vanilla templates/disable-sip.pkr.hcl
 ```

templates/base.pkr.hcl

@@ -16,7 +16,7 @@ variable "gha_version" {
 }
 
 source "tart-cli" "tart" {
-  vm_base_name = "ghcr.io/cirruslabs/macos-${var.macos_version}-vanilla:13.4"
+  vm_base_name = "ghcr.io/cirruslabs/macos-${var.macos_version}-vanilla:latest"
   vm_name      = "${var.macos_version}-base"
   cpu_count    = 4
   memory_gb    = 8

templates/vanilla-monterey.pkr.hcl

@@ -90,6 +90,8 @@ build {
       "sudo defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser admin",
       // Disable screensaver at login screen
       "sudo defaults write /Library/Preferences/com.apple.screensaver loginWindowIdleTime 0",
+      // Disable screensaver for admin user
+      "defaults -currentHost write com.apple.screensaver idleTime 0",
       // Prevent the VM from sleeping
       "sudo systemsetup -setdisplaysleep Off",
       "sudo systemsetup -setsleep Off",

templates/vanilla-sonoma.pkr.hcl

@@ -11,9 +11,9 @@ source "tart-cli" "tart" {
   # Currently macOS 14 (Sonoma) can only be obtained via the following links:
   # unauthenticated[1] and authenticated[2].
   #
-  # [1]: https://updates.cdn-apple.com/2023SummerSeed/fullrestores/032-95861/67600C59-8516-4A46-B9D7-4007D395CEF5/UniversalMac_14.0_23A5276g_Restore.ipsw
-  # [2]: https://download.developer.apple.com/WWDC_2023/macOS_14_Beta_Restore_Images/UniversalMac_14.0_23A5257q_Restore.ipsw
-  from_ipsw    = "https://updates.cdn-apple.com/2023SummerSeed/fullrestores/032-95861/67600C59-8516-4A46-B9D7-4007D395CEF5/UniversalMac_14.0_23A5276g_Restore.ipsw"
+  # [1]: https://updates.cdn-apple.com/2023SummerSeed/fullrestores/042-13887/3B4075C1-B695-49EA-82D9-4B720699D341/UniversalMac_14.0_23A5286i_Restore.ipsw
+  # [2]: https://download.developer.apple.com/WWDC_2023/macOS_14_Beta_Restore_Images/UniversalMac_14.0_23A5286i_Restore.ipsw
+  from_ipsw    = "https://updates.cdn-apple.com/2023SummerSeed/fullrestores/042-13887/3B4075C1-B695-49EA-82D9-4B720699D341/UniversalMac_14.0_23A5286i_Restore.ipsw"
   vm_name      = "sonoma-vanilla"
   cpu_count    = 4
   memory_gb    = 8
@@ -99,6 +99,8 @@ build {
       "sudo defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser admin",
       // Disable screensaver at login screen
       "sudo defaults write /Library/Preferences/com.apple.screensaver loginWindowIdleTime 0",
+      // Disable screensaver for admin user
+      "defaults -currentHost write com.apple.screensaver idleTime 0",
       // Prevent the VM from sleeping
       "sudo systemsetup -setdisplaysleep Off",
       "sudo systemsetup -setsleep Off",

templates/vanilla-ventura.pkr.hcl

@@ -96,6 +96,8 @@ build {
       "sudo defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser admin",
       // Disable screensaver at login screen
       "sudo defaults write /Library/Preferences/com.apple.screensaver loginWindowIdleTime 0",
+      // Disable screensaver for admin user
+      "defaults -currentHost write com.apple.screensaver idleTime 0",
       // Prevent the VM from sleeping
       "sudo systemsetup -setdisplaysleep Off",
       "sudo systemsetup -setsleep Off",

variables.pkrvars.hcl

@@ -1,3 +1,3 @@
 macos_version = "ventura"
-gha_version   = "2.304.0"
+gha_version   = "2.307.1"
 xcode_version = "14.3.1"