From 2ac8526c71ed60dfb46cff2fa99860eb509ff154 Mon Sep 17 00:00:00 2001
From: Nikolay Edigaryev <edigaryev@gmail.com>
Date: Sun, 15 Mar 2026 00:06:47 +0100
Subject: [PATCH] Disable SIP before running templates/base.pkr.hcl

---
 .ci/cirrus.base.yml    | 7 ++++---
 DEVELOPMENT.md         | 2 +-
 templates/base.pkr.hcl | 5 ++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.ci/cirrus.base.yml b/.ci/cirrus.base.yml
index 1844c00..f6390c1 100644
--- a/.ci/cirrus.base.yml
+++ b/.ci/cirrus.base.yml
@@ -14,11 +14,12 @@ task:
   <<: *defaults
   pull_vanilla_script:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-vanilla:latest
+    - tart clone ghcr.io/cirruslabs/macos-$MACOS_VERSION-vanilla:latest "$MACOS_VERSION-base"
+  disable_sip_script:
+    - packer build -var vm_name="$MACOS_VERSION-base" "templates/${DISABLE_SIP_TEMPLATE}"
   build_base_script:
     - packer init templates/base.pkr.hcl
-    - packer build -var macos_version="$MACOS_VERSION" templates/base.pkr.hcl
-  disable_sip_script:
-    - packer build -var vm_name=$MACOS_VERSION-base "templates/${DISABLE_SIP_TEMPLATE}"
+    - packer build -var vm_name="$MACOS_VERSION-base" templates/base.pkr.hcl
   push_base_script:
     - tart push $MACOS_VERSION-base ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
   always:
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index c6385f4..7e46fc9 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -15,7 +15,7 @@ packer build -var vm_name=sonoma-vanilla templates/disable-sip.pkr.hcl
 ## Building Base Image
 
 ```bash
-packer build -var macos_version=sonoma templates/base.pkr.hcl
+packer build -var vm_name=sonoma-vanilla templates/base.pkr.hcl
 ```
 
 ## Building Xcode Image
diff --git a/templates/base.pkr.hcl b/templates/base.pkr.hcl
index 601ddd1..ffba0f7 100644
--- a/templates/base.pkr.hcl
+++ b/templates/base.pkr.hcl
@@ -7,13 +7,12 @@ packer {
   }
 }
 
-variable "macos_version" {
+variable "vm_name" {
   type = string
 }
 
 source "tart-cli" "tart" {
-  vm_base_name = "ghcr.io/cirruslabs/macos-${var.macos_version}-vanilla:latest"
-  vm_name      = "${var.macos_version}-base"
+  vm_name      = "${var.vm_name}"
   cpu_count    = 4
   memory_gb    = 8
   disk_size_gb = 50