From 8efe05804db3d24ce3d49a43960fc6fbdcba04c9 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 24 Feb 2026 18:51:50 +0000
Subject: [PATCH] Defer cleanup of chef until we are running under cinc

---
 cookbooks/chef/recipes/default.rb | 52 +++++++++++++++----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index efa140014..4778bea15 100644
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -93,6 +93,32 @@ if node[:chef][:client][:cinc]
   file "/etc/logrotate.d/chef" do
     action :delete
   end
+
+  if node[:packages][:cinc]
+    package "chef" do
+      action :purge
+    end
+
+    directory "/etc/chef" do
+      action :delete
+      recursive true
+    end
+
+    directory "/var/chef" do
+      action :delete
+      recursive true
+    end
+
+    directory "/var/log/chef" do
+      action :delete
+      recursive true
+    end
+
+    directory "/opt/chef" do
+      action :delete
+      recursive true
+    end
+  end
 end
 
 remote_file "#{cache_dir}/#{chef_package}" do
@@ -179,29 +205,3 @@ end
 service "#{chef_name}-client.timer" do
   action [:enable, :start]
 end
-
-if node[:chef][:client][:cinc]
-  package "chef" do
-    action :purge
-  end
-
-  directory "/etc/chef" do
-    action :delete
-    recursive true
-  end
-
-  directory "/var/chef" do
-    action :delete
-    recursive true
-  end
-
-  directory "/var/log/chef" do
-    action :delete
-    recursive true
-  end
-
-  directory "/opt/chef" do
-    action :delete
-    recursive true
-  end
-end
-- 
2.39.5