From b0576bab9180ccfe2c3da7a62848d2db3776db2c Mon Sep 17 00:00:00 2001
From: unman <unman@thirdeyesecurity.org>
Date: Fri, 5 Aug 2022 12:09:02 +0000
Subject: [PATCH] Builder - Update to 36 and use call to qvm.template_installed

---
 builder/clone.sls                      |  9 ++++-----
 builder/template-fedora-34-minimal.sls | 17 -----------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 builder/template-fedora-34-minimal.sls

diff --git a/builder/clone.sls b/builder/clone.sls
index b40652e..94bf232 100644
--- a/builder/clone.sls
+++ b/builder/clone.sls
@@ -1,9 +1,8 @@
-include:
-  - build.template-fedora-34-minimal
+builder_requisite:
+  qvm.template_installed:
+    - name: fedora-36-minimal
 
 qvm-clone-id:
   qvm.clone:
-    - require:
-      - sls: build.template-fedora-34-minimal 
     - name: template-builder
-    - source: fedora-34-minimal
+    - source: fedora-36-minimal
diff --git a/builder/template-fedora-34-minimal.sls b/builder/template-fedora-34-minimal.sls
deleted file mode 100644
index b992a2a..0000000
--- a/builder/template-fedora-34-minimal.sls
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: set syntax=yaml ts=2 sw=2 sts=2 et :
-
-##
-# qvm.template-fedora-34-minimal
-# ======================
-#
-# Installs 'fedora-34-minimal' template.
-#
-# Execute:
-#   qubesctl state.sls qvm.template-fedora-34-minimal dom0
-##
-
-template-fedora-34-minimal:
-  qvm.template_installed:
-    - name:     qubes-template-fedora-34-minimal
-    - fromrepo: qubes-templates-itl