Compare commits

..

No commits in common. "ef5a44fa42172571d12cd7ac7e197114dd6d1ffe" and "fb41ae96611cd283e160a2ee6eb0da4e064dfcf0" have entirely different histories.

View file

@ -1,5 +1,5 @@
SHELL = /bin/bash
.POSIX_SHELL
ifneq (,$(wildcard .bundle-env))
include .bundle-env
@ -86,7 +86,6 @@ 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 --force-color --skip-dom0 --targets templates state.apply $(APPLY_ARGS)
qubesctl --show-output state.apply $(APPLY_ARGS) saltenv=user
qubesctl top.disable $(APPLY_ARGS)