From 70d837dcdf028726476d1d63d2f11f3d1fd6dfce Mon Sep 17 00:00:00 2001 From: mustard Date: Tue, 28 Oct 2025 00:37:45 +0100 Subject: [PATCH 1/2] eh --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 798fcb8..2c1fb7e 100644 --- a/Makefile +++ b/Makefile @@ -88,5 +88,5 @@ apply: qubesctl top.enable topd qubesctl top.enable $(APPLY_ARGS) - qubesctl --show-output --force-color --targets templates state.apply $(APPLY_ARGS) + qubesctl --show-output --force-color --targets templates state.apply $(APPLY_ARGS) -l debug qubesctl top.disable $(APPLY_ARGS) From b35f51affbb7276f6c38ac18e08545fd0961523a Mon Sep 17 00:00:00 2001 From: mustard Date: Tue, 28 Oct 2025 00:47:47 +0100 Subject: [PATCH 2/2] fixing apply --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2c1fb7e..cab100d 100644 --- a/Makefile +++ b/Makefile @@ -83,10 +83,9 @@ install: .PHONY: apply apply: - install -D -oroot -groot -m0644 conf/z_user.conf /etc/salt/minion.d/z_user.conf - install -D -oroot -groot -m0644 conf/overrides.conf /usr/local/etc/salt/minion.d/overrides.conf + run0 install -D -oroot -groot -m0644 conf/z_user.conf /etc/salt/minion.d/z_user.conf + run0 install -D -oroot -groot -m0644 conf/overrides.conf /usr/local/etc/salt/minion.d/overrides.conf - qubesctl top.enable topd - qubesctl top.enable $(APPLY_ARGS) - qubesctl --show-output --force-color --targets templates state.apply $(APPLY_ARGS) -l debug - qubesctl top.disable $(APPLY_ARGS) + run0 qubesctl top.enable --show-output --force-color $(APPLY_ARGS) + run0 qubesctl --show-output --force-color --targets $(APPLY_ARGS) state.apply -l debug +