diff --git a/Makefile b/Makefile index 4b16e03..adc65b7 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SHELL = /bin/bash - +.POSIX_SHELL ifneq (,$(wildcard .bundle-env)) include .bundle-env @@ -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 --force-color --skip-dom0 --targets templates state.apply $(APPLY_ARGS) qubesctl top.disable $(APPLY_ARGS)