From 803acf726806dbf291fa48579542f529bf4da5db Mon Sep 17 00:00:00 2001 From: mustard Date: Sat, 25 Oct 2025 00:06:02 +0200 Subject: [PATCH 1/2] hmm --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4b16e03..c146158 100644 --- a/Makefile +++ b/Makefile @@ -86,6 +86,7 @@ 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 + qubesctl top.enable topd qubesctl top.enable $(APPLY_ARGS) - qubesctl --show-output state.apply $(APPLY_ARGS) saltenv=user + qubesctl --show-output state.apply $(APPLY_ARGS) qubesctl top.disable $(APPLY_ARGS) From ef5a44fa42172571d12cd7ac7e197114dd6d1ffe Mon Sep 17 00:00:00 2001 From: mustard Date: Tue, 28 Oct 2025 00:18:20 +0100 Subject: [PATCH 2/2] Hmmm --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c146158..adc65b7 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SHELL = /bin/bash - +.POSIX_SHELL ifneq (,$(wildcard .bundle-env)) include .bundle-env @@ -88,5 +88,5 @@ apply: qubesctl top.enable topd qubesctl top.enable $(APPLY_ARGS) - qubesctl --show-output state.apply $(APPLY_ARGS) + qubesctl --show-output --force-color --skip-dom0 --targets templates state.apply $(APPLY_ARGS) qubesctl top.disable $(APPLY_ARGS)