From 15711c912fcb7efe732d60d9d5b047ad9b40381e Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Mon, 24 Jun 2024 08:32:29 +0200
Subject: [PATCH] fix: do not change kicksecure kernel by default

Fixes: https://github.com/ben-grande/qusal/issues/71
---
 rpm_spec/qusal-kicksecure-minimal.spec |  4 +++-
 salt/kicksecure-minimal/README.md      |  2 --
 salt/kicksecure-minimal/prefs.sls      | 22 ----------------------
 salt/kicksecure-minimal/prefs.top      | 10 ----------
 4 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 salt/kicksecure-minimal/prefs.sls
 delete mode 100644 salt/kicksecure-minimal/prefs.top

diff --git a/rpm_spec/qusal-kicksecure-minimal.spec b/rpm_spec/qusal-kicksecure-minimal.spec
index 6fcb506..bffc675 100644
--- a/rpm_spec/qusal-kicksecure-minimal.spec
+++ b/rpm_spec/qusal-kicksecure-minimal.spec
@@ -71,7 +71,6 @@ if test "$1" = "1"; then
   ## Install
   qubesctl state.apply kicksecure-minimal.create
   qubesctl --skip-dom0 --targets=kicksecure-17-minimal state.apply kicksecure-minimal.install
-  qubesctl state.apply kicksecure-minimal.prefs
 elif test "$1" = "2"; then
   ## Upgrade
   true
@@ -104,6 +103,9 @@ fi
 %dnl TODO: missing '%ghost', files generated during %post, such as Qrexec policies.
 
 %changelog
+* Mon Jun 24 2024 Ben Grande <ben.grande.b@gmail.com> - 630641f
+- fix: do not change kicksecure kernel by default
+
 * Sat Jun 22 2024 Ben Grande <ben.grande.b@gmail.com> - a6194e0
 - fix: remove cacher tag from Kicksecure template
 
diff --git a/salt/kicksecure-minimal/README.md b/salt/kicksecure-minimal/README.md
index 8ecbd56..b5be0cf 100644
--- a/salt/kicksecure-minimal/README.md
+++ b/salt/kicksecure-minimal/README.md
@@ -22,7 +22,6 @@ on it.
 sudo qubesctl top.enable kicksecure-minimal
 sudo qubesctl --targets=kicksecure-17-minimal state.apply
 sudo qubesctl top.disable kicksecure-minimal
-sudo qubesctl state.apply kicksecure-minimal.prefs
 ```
 
 - State:
@@ -30,7 +29,6 @@ sudo qubesctl state.apply kicksecure-minimal.prefs
 ```sh
 sudo qubesctl state.apply kicksecure-minimal.create
 sudo qubesctl --skip-dom0 --targets=kicksecure-17-minimal state.apply kicksecure-minimal.install
-sudo qubesctl state.apply kicksecure-minimal.prefs
 ```
 <!-- pkg:end:post-install -->
 
diff --git a/salt/kicksecure-minimal/prefs.sls b/salt/kicksecure-minimal/prefs.sls
deleted file mode 100644
index 93ac235..0000000
--- a/salt/kicksecure-minimal/prefs.sls
+++ /dev/null
@@ -1,22 +0,0 @@
-{#
-SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
-
-SPDX-License-Identifier: AGPL-3.0-or-later
-#}
-
-{%- from "qvm/template.jinja" import load -%}
-
-{%- import slsdotpath ~ "/template.jinja" as template -%}
-
-include:
-  - .clone
-
-{% load_yaml as defaults -%}
-name: {{ template.template }}
-force: True
-require:
-- sls: {{ slsdotpath }}.clone
-prefs:
-- kernel: pvgrub2-pvh
-{%- endload %}
-{{ load(defaults) }}
diff --git a/salt/kicksecure-minimal/prefs.top b/salt/kicksecure-minimal/prefs.top
deleted file mode 100644
index 7352fc6..0000000
--- a/salt/kicksecure-minimal/prefs.top
+++ /dev/null
@@ -1,10 +0,0 @@
-{#
-SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
-
-SPDX-License-Identifier: AGPL-3.0-or-later
-#}
-
-base:
-  'dom0':
-    - match: nodegroup
-    - kicksecure-minimal.prefs