From e0b11b3daf31ef1e11d5f69e5131c8525d1f39d0 Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Thu, 4 Jan 2024 17:25:16 +0100
Subject: [PATCH] fix: do not install net debug tools by default

---
 salt/sys-firewall/install.sls | 3 ---
 salt/sys-net/README.md        | 9 +++++++--
 salt/sys-net/install.sls      | 1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/salt/sys-firewall/install.sls b/salt/sys-firewall/install.sls
index f6d8a5c..e22a797 100644
--- a/salt/sys-firewall/install.sls
+++ b/salt/sys-firewall/install.sls
@@ -6,9 +6,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 {% if grains['nodename'] != 'dom0' -%}
 
-include:
-  - sys-net.install-debug
-
 "{{ slsdotpath }}-updated":
   pkg.uptodate:
     - refresh: True
diff --git a/salt/sys-net/README.md b/salt/sys-net/README.md
index c9a7fdb..882bb50 100644
--- a/salt/sys-net/README.md
+++ b/salt/sys-net/README.md
@@ -1,6 +1,6 @@
 # sys-net
 
-PCI handler of Network devices in Qubes OS.
+PCI handler of network devices in Qubes OS.
 
 ## Table of Contents
 
@@ -45,7 +45,12 @@ qubesctl state.apply sys-net.prefs
 ```
 <!-- pkg:end:post-install -->
 
-Alternatively, if you prefer to have a disposable net qube:
+If you need to debug a net qube, install some helper tools:
+```sh
+qubesctl --skip-dom0 --targets=tpl-sys-net state.apply sys-net.install-debug
+```
+
+If you prefer to have a disposable net qube:
 ```sh
 qubesctl state.apply sys-net.prefs-disp
 ```
diff --git a/salt/sys-net/install.sls b/salt/sys-net/install.sls
index c387fe5..4bb3d7b 100644
--- a/salt/sys-net/install.sls
+++ b/salt/sys-net/install.sls
@@ -7,7 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - .install-debug
   - dotfiles.copy-x11
 
 "{{ slsdotpath }}-updated":