From 56a4296421f4312675a5ff360c7a4a235748e466 Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Fri, 16 Aug 2024 14:02:53 +0200 Subject: [PATCH] fix: skip YUM weak dependencies installation Fixes: https://github.com/ben-grande/qusal/issues/96 --- docs/SALT.md | 2 ++ salt/ansible/install.sls | 2 ++ salt/browser/install-chrome.sls | 1 + salt/browser/install-chromium.sls | 1 + salt/browser/install-common.sls | 2 ++ salt/browser/install-firefox-esr.sls | 1 + salt/browser/install-firefox.sls | 1 + salt/browser/install-lynx.sls | 1 + salt/browser/install-mullvad.sls | 1 + salt/browser/install-w3m.sls | 1 + salt/dev/install-python-tools.sls | 1 + salt/dev/install.sls | 2 ++ salt/docker/install.sls | 2 ++ salt/dom0/desktop-awesome.sls | 1 + salt/dom0/desktop-i3-settings.sls | 1 + salt/dom0/desktop-i3.sls | 1 + salt/dom0/desktop-kde.sls | 1 + salt/dom0/install-dev.sls | 1 + salt/dom0/screenshot.sls | 1 + salt/dom0/xorg.sls | 1 + salt/electrum/install-builder.sls | 1 + salt/electrum/install-distro.sls | 1 + salt/electrum/install.sls | 2 ++ salt/element/install.sls | 1 + salt/fetcher/install.sls | 1 + salt/kicksecure-minimal/install-developers.sls | 1 + salt/kicksecure-minimal/install.sls | 1 + salt/kicksecure-minimal/kernel-pv.sls | 1 + salt/mail/install-fetcher.sls | 1 + salt/mail/install-reader.sls | 1 + salt/mail/install-sender.sls | 1 + salt/media/install.sls | 1 + salt/mgmt/install.sls | 1 + salt/mirage-builder/install.sls | 1 + salt/opentofu/install.sls | 1 + salt/qubes-builder/install-dev.sls | 1 + salt/qubes-builder/install-qubes-executor.sls | 1 + salt/qubes-builder/install.sls | 1 + salt/reader/install.sls | 1 + salt/remmina/install.sls | 1 + salt/signal/install.sls | 1 + salt/sys-audio/install-bluetooth.sls | 1 + salt/sys-audio/install-client.sls | 2 ++ salt/sys-audio/install-easyeffects.sls | 1 + salt/sys-audio/install.sls | 2 ++ salt/sys-bitcoin/install-common.sls | 2 ++ salt/sys-bitcoin/install-source.sls | 3 +++ salt/sys-cacher/install.sls | 1 + salt/sys-electrs/install-builder-source.sls | 1 + salt/sys-electrs/install-source.sls | 1 + salt/sys-electrumx/install-builder.sls | 1 + salt/sys-electrumx/install.sls | 1 + salt/sys-firewall/install.sls | 1 + salt/sys-git/install-client.sls | 1 + salt/sys-git/install.sls | 1 + salt/sys-gui-gpu/create.sls | 1 + salt/sys-gui-vnc/create.sls | 1 + salt/sys-gui/create.sls | 1 + salt/sys-gui/install.sls | 2 ++ salt/sys-net/install-debug.sls | 1 + salt/sys-net/install-proxy.sls | 1 + salt/sys-net/install.sls | 1 + salt/sys-pgp/install.sls | 2 ++ salt/sys-pihole/install.sls | 1 + salt/sys-print/install-driver-all.sls | 1 + salt/sys-print/install.sls | 1 + salt/sys-rsync/install-client.sls | 1 + salt/sys-rsync/install.sls | 1 + salt/sys-ssh-agent/install-client.sls | 2 ++ salt/sys-ssh-agent/install.sls | 2 ++ salt/sys-ssh/install-client.sls | 1 + salt/sys-ssh/install.sls | 1 + salt/sys-syncthing/install-client.sls | 1 + salt/sys-syncthing/install.sls | 1 + salt/sys-tailscale/install.sls | 1 + salt/sys-usb/create.sls | 1 + salt/sys-usb/install-client-cryptsetup.sls | 1 + salt/sys-usb/install-client-fido.sls | 1 + salt/sys-usb/install-client-proxy.sls | 1 + salt/sys-usb/install.sls | 1 + salt/sys-wireguard/install.sls | 1 + salt/terraform/install.sls | 1 + salt/utils/tools/builder/core.sls | 2 ++ salt/utils/tools/builder/doc.sls | 1 + salt/utils/tools/zsh/install.sls | 1 + salt/vault/install.sls | 2 ++ salt/video-companion/create.sls | 1 + salt/video-companion/install-receiver-debug.sls | 1 + salt/video-companion/install-receiver.sls | 1 + salt/video-companion/install-sender.sls | 1 + 90 files changed, 107 insertions(+) diff --git a/docs/SALT.md b/docs/SALT.md index 29f1c86..83c8ea3 100644 --- a/docs/SALT.md +++ b/docs/SALT.md @@ -185,6 +185,7 @@ keys-installed: {# Enforce that we don't want to install suggested packages #} - skip_suggestions: True {# List of packages to be installed #} + - setopt: "install_weak_deps=False" - pkgs: {# Wait, some package names do not match on different distributions #} - keepassxc @@ -208,6 +209,7 @@ keys-installed-os-specific: - install_recommends: False - skip_suggestions: True {# Get the Jinja variable 'pkg.pkg' and convert it to an YAML list #} + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {# End our 'if' statement created above #} diff --git a/salt/ansible/install.sls b/salt/ansible/install.sls index 83c879c..e76d060 100644 --- a/salt/ansible/install.sls +++ b/salt/ansible/install.sls @@ -22,6 +22,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates @@ -48,6 +49,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {% endif -%} diff --git a/salt/browser/install-chrome.sls b/salt/browser/install-chrome.sls index 9f4a279..859a9a2 100644 --- a/salt/browser/install-chrome.sls +++ b/salt/browser/install-chrome.sls @@ -21,6 +21,7 @@ include: - sls: {{ slsdotpath }}.install-chrome-repo - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - google-chrome-stable diff --git a/salt/browser/install-chromium.sls b/salt/browser/install-chromium.sls index d8efc44..9128f97 100644 --- a/salt/browser/install-chromium.sls +++ b/salt/browser/install-chromium.sls @@ -15,6 +15,7 @@ include: - sls: {{ slsdotpath }}.install-common - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - chromium diff --git a/salt/browser/install-common.sls b/salt/browser/install-common.sls index a235440..09e2c9d 100644 --- a/salt/browser/install-common.sls +++ b/salt/browser/install-common.sls @@ -17,6 +17,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates @@ -37,6 +38,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {% endif -%} diff --git a/salt/browser/install-firefox-esr.sls b/salt/browser/install-firefox-esr.sls index 8f81c10..dc4a357 100644 --- a/salt/browser/install-firefox-esr.sls +++ b/salt/browser/install-firefox-esr.sls @@ -15,6 +15,7 @@ include: - sls: {{ slsdotpath }}.install-common - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - firefox-esr diff --git a/salt/browser/install-firefox.sls b/salt/browser/install-firefox.sls index 5990a6b..efc1065 100644 --- a/salt/browser/install-firefox.sls +++ b/salt/browser/install-firefox.sls @@ -17,6 +17,7 @@ include: - sls: {{ slsdotpath }}.install-firefox-repo - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - firefox diff --git a/salt/browser/install-lynx.sls b/salt/browser/install-lynx.sls index c2db336..5ffe0af 100644 --- a/salt/browser/install-lynx.sls +++ b/salt/browser/install-lynx.sls @@ -15,6 +15,7 @@ include: - sls: {{ slsdotpath }}.install-common - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - lynx diff --git a/salt/browser/install-mullvad.sls b/salt/browser/install-mullvad.sls index c660897..816c4cb 100644 --- a/salt/browser/install-mullvad.sls +++ b/salt/browser/install-mullvad.sls @@ -17,6 +17,7 @@ include: - sls: {{ slsdotpath }}.install-mullvad-repo - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - mullvad-browser diff --git a/salt/browser/install-w3m.sls b/salt/browser/install-w3m.sls index cc368b6..55b93f4 100644 --- a/salt/browser/install-w3m.sls +++ b/salt/browser/install-w3m.sls @@ -16,6 +16,7 @@ include: - sls: {{ slsdotpath }}.install-common - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - w3m diff --git a/salt/dev/install-python-tools.sls b/salt/dev/install-python-tools.sls index 302f690..f7d522b 100644 --- a/salt/dev/install-python-tools.sls +++ b/salt/dev/install-python-tools.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - python3-dev - python3-venv diff --git a/salt/dev/install.sls b/salt/dev/install.sls index d757adb..c2741a4 100644 --- a/salt/dev/install.sls +++ b/salt/dev/install.sls @@ -21,6 +21,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: ## Necessary - qubes-core-agent-passwordless-root @@ -65,6 +66,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {% endif -%} diff --git a/salt/docker/install.sls b/salt/docker/install.sls index 97feeb4..52bd8f4 100644 --- a/salt/docker/install.sls +++ b/salt/docker/install.sls @@ -27,6 +27,7 @@ include: {# "{{ slsdotpath }}-removed-os-specific": pkg.removed: + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg_removed|sequence|yaml }} #} @@ -37,6 +38,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - man-db diff --git a/salt/dom0/desktop-awesome.sls b/salt/dom0/desktop-awesome.sls index b338161..a808e38 100644 --- a/salt/dom0/desktop-awesome.sls +++ b/salt/dom0/desktop-awesome.sls @@ -15,6 +15,7 @@ include: pkg.installed: - require: - sls: utils.tools.common.update + - setopt: "install_weak_deps=False" - pkgs: - awesome diff --git a/salt/dom0/desktop-i3-settings.sls b/salt/dom0/desktop-i3-settings.sls index 9834262..1747654 100644 --- a/salt/dom0/desktop-i3-settings.sls +++ b/salt/dom0/desktop-i3-settings.sls @@ -15,6 +15,7 @@ include: pkg.installed: - require: - sls: utils.tools.common.update + - setopt: "install_weak_deps=False" - pkgs: - i3-settings-qubes diff --git a/salt/dom0/desktop-i3.sls b/salt/dom0/desktop-i3.sls index 171953d..011774b 100644 --- a/salt/dom0/desktop-i3.sls +++ b/salt/dom0/desktop-i3.sls @@ -15,6 +15,7 @@ include: pkg.installed: - require: - sls: utils.tools.common.update + - setopt: "install_weak_deps=False" - pkgs: - i3 diff --git a/salt/dom0/desktop-kde.sls b/salt/dom0/desktop-kde.sls index b960e0c..75e045c 100644 --- a/salt/dom0/desktop-kde.sls +++ b/salt/dom0/desktop-kde.sls @@ -15,6 +15,7 @@ include: pkg.installed: - require: - sls: utils.tools.common.update + - setopt: "install_weak_deps=False" - pkgs: - kde-settings-qubes - sddm diff --git a/salt/dom0/install-dev.sls b/salt/dom0/install-dev.sls index 16e24cf..b6290c2 100644 --- a/salt/dom0/install-dev.sls +++ b/salt/dom0/install-dev.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - vim - tmux diff --git a/salt/dom0/screenshot.sls b/salt/dom0/screenshot.sls index 82cecf8..513e10a 100644 --- a/salt/dom0/screenshot.sls +++ b/salt/dom0/screenshot.sls @@ -17,6 +17,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - zenity - maim diff --git a/salt/dom0/xorg.sls b/salt/dom0/xorg.sls index cf7dcc6..86c33be 100644 --- a/salt/dom0/xorg.sls +++ b/salt/dom0/xorg.sls @@ -13,6 +13,7 @@ include: pkg.installed: - require: - sls: utils.tools.common.update + - setopt: "install_weak_deps=False" - pkgs: - xorg-x11-xinit-session diff --git a/salt/electrum/install-builder.sls b/salt/electrum/install-builder.sls index 5ebdec5..f6b1c3a 100644 --- a/salt/electrum/install-builder.sls +++ b/salt/electrum/install-builder.sls @@ -19,6 +19,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/electrum/install-distro.sls b/salt/electrum/install-distro.sls index c71b770..1262add 100644 --- a/salt/electrum/install-distro.sls +++ b/salt/electrum/install-distro.sls @@ -18,6 +18,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - electrum - python3-pyqt5 diff --git a/salt/electrum/install.sls b/salt/electrum/install.sls index 402f624..5e059a4 100644 --- a/salt/electrum/install.sls +++ b/salt/electrum/install.sls @@ -14,6 +14,7 @@ include: "{{ slsdotpath }}-remove-distro-package": pkg.removed: + - setopt: "install_weak_deps=False" - pkgs: - electrum - python3-electrum @@ -25,6 +26,7 @@ include: - pkg: "{{ slsdotpath }}-remove-distro-package" - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - socat - man-db diff --git a/salt/element/install.sls b/salt/element/install.sls index 3818c4a..3d8f863 100644 --- a/salt/element/install.sls +++ b/salt/element/install.sls @@ -18,6 +18,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/fetcher/install.sls b/salt/fetcher/install.sls index b0ff8cb..7ee42c3 100644 --- a/salt/fetcher/install.sls +++ b/salt/fetcher/install.sls @@ -19,6 +19,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/kicksecure-minimal/install-developers.sls b/salt/kicksecure-minimal/install-developers.sls index 32ce91d..f5476af 100644 --- a/salt/kicksecure-minimal/install-developers.sls +++ b/salt/kicksecure-minimal/install-developers.sls @@ -26,6 +26,7 @@ include: - sls: kicksecure-minimal.install - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-kernel-vm-support - linux-image-amd64 diff --git a/salt/kicksecure-minimal/install.sls b/salt/kicksecure-minimal/install.sls index beecb37..fad2e34 100644 --- a/salt/kicksecure-minimal/install.sls +++ b/salt/kicksecure-minimal/install.sls @@ -20,6 +20,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - kicksecure-qubes-cli diff --git a/salt/kicksecure-minimal/kernel-pv.sls b/salt/kicksecure-minimal/kernel-pv.sls index 6056d20..ddfd2e6 100644 --- a/salt/kicksecure-minimal/kernel-pv.sls +++ b/salt/kicksecure-minimal/kernel-pv.sls @@ -18,6 +18,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - grub2-xen-pvh diff --git a/salt/mail/install-fetcher.sls b/salt/mail/install-fetcher.sls index 7fb7b04..5495254 100644 --- a/salt/mail/install-fetcher.sls +++ b/salt/mail/install-fetcher.sls @@ -18,6 +18,7 @@ include: - sls: utils.tools.common.update - skip_suggestions: True - install_recommends: False + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/mail/install-reader.sls b/salt/mail/install-reader.sls index f6ff7e7..f178e28 100644 --- a/salt/mail/install-reader.sls +++ b/salt/mail/install-reader.sls @@ -20,6 +20,7 @@ include: - sls: utils.tools.common.update - skip_suggestions: True - install_recommends: False + - setopt: "install_weak_deps=False" - pkgs: - qubes-app-shutdown-idle - qubes-pdf-converter diff --git a/salt/mail/install-sender.sls b/salt/mail/install-sender.sls index fb0e4f8..663e285 100644 --- a/salt/mail/install-sender.sls +++ b/salt/mail/install-sender.sls @@ -18,6 +18,7 @@ include: - sls: utils.tools.common.update - skip_suggestions: True - install_recommends: False + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/media/install.sls b/salt/media/install.sls index 89d8b24..b0ade54 100644 --- a/salt/media/install.sls +++ b/salt/media/install.sls @@ -18,6 +18,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-pdf-converter - qubes-img-converter diff --git a/salt/mgmt/install.sls b/salt/mgmt/install.sls index e8216e6..3f5a5e0 100644 --- a/salt/mgmt/install.sls +++ b/salt/mgmt/install.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-mgmt-salt-vm-connector - socat diff --git a/salt/mirage-builder/install.sls b/salt/mirage-builder/install.sls index 5ee5c90..70c99d8 100644 --- a/salt/mirage-builder/install.sls +++ b/salt/mirage-builder/install.sls @@ -23,6 +23,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: ## https://github.com/mirage/qubes-mirage-firewall/blob/main/Dockerfile - qubes-core-agent-networking diff --git a/salt/opentofu/install.sls b/salt/opentofu/install.sls index d726fda..27ae96e 100644 --- a/salt/opentofu/install.sls +++ b/salt/opentofu/install.sls @@ -18,6 +18,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/qubes-builder/install-dev.sls b/salt/qubes-builder/install-dev.sls index 52fa90f..158f08a 100644 --- a/salt/qubes-builder/install-dev.sls +++ b/salt/qubes-builder/install-dev.sls @@ -17,6 +17,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - vim-enhanced - tmux diff --git a/salt/qubes-builder/install-qubes-executor.sls b/salt/qubes-builder/install-qubes-executor.sls index 09ac344..e91d0c7 100644 --- a/salt/qubes-builder/install-qubes-executor.sls +++ b/salt/qubes-builder/install-qubes-executor.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - qubes-core-agent-passwordless-root diff --git a/salt/qubes-builder/install.sls b/salt/qubes-builder/install.sls index bfe9272..c78482c 100644 --- a/salt/qubes-builder/install.sls +++ b/salt/qubes-builder/install.sls @@ -26,6 +26,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: ## Minimal template dependencies - qubes-core-agent-networking diff --git a/salt/reader/install.sls b/salt/reader/install.sls index 28d035e..d6acc1c 100644 --- a/salt/reader/install.sls +++ b/salt/reader/install.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-pdf-converter - qubes-img-converter diff --git a/salt/remmina/install.sls b/salt/remmina/install.sls index 0c4f37b..577cecd 100644 --- a/salt/remmina/install.sls +++ b/salt/remmina/install.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/signal/install.sls b/salt/signal/install.sls index 28d1e16..626b36a 100644 --- a/salt/signal/install.sls +++ b/salt/signal/install.sls @@ -19,6 +19,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/sys-audio/install-bluetooth.sls b/salt/sys-audio/install-bluetooth.sls index 7b42819..b526496 100644 --- a/salt/sys-audio/install-bluetooth.sls +++ b/salt/sys-audio/install-bluetooth.sls @@ -17,6 +17,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - blueman - libspa-0.2-bluetooth diff --git a/salt/sys-audio/install-client.sls b/salt/sys-audio/install-client.sls index f519601..a99f3f4 100644 --- a/salt/sys-audio/install-client.sls +++ b/salt/sys-audio/install-client.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - pipewire-qubes - wireplumber @@ -37,6 +38,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {% endif -%} diff --git a/salt/sys-audio/install-easyeffects.sls b/salt/sys-audio/install-easyeffects.sls index 227b2ac..baa04df 100644 --- a/salt/sys-audio/install-easyeffects.sls +++ b/salt/sys-audio/install-easyeffects.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - easyeffects diff --git a/salt/sys-audio/install.sls b/salt/sys-audio/install.sls index 7ea6ef2..92a465c 100644 --- a/salt/sys-audio/install.sls +++ b/salt/sys-audio/install.sls @@ -17,6 +17,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-admin-client - qubes-audio-daemon @@ -40,6 +41,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {% endif -%} diff --git a/salt/sys-bitcoin/install-common.sls b/salt/sys-bitcoin/install-common.sls index 0483b62..e941ba6 100644 --- a/salt/sys-bitcoin/install-common.sls +++ b/salt/sys-bitcoin/install-common.sls @@ -20,6 +20,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates @@ -49,6 +50,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} "{{ slsdotpath }}-bin": diff --git a/salt/sys-bitcoin/install-source.sls b/salt/sys-bitcoin/install-source.sls index 82fd4b7..1676418 100644 --- a/salt/sys-bitcoin/install-source.sls +++ b/salt/sys-bitcoin/install-source.sls @@ -19,6 +19,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - clang - ccache @@ -42,6 +43,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {% set pkg = { @@ -60,6 +62,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {% endif -%} diff --git a/salt/sys-cacher/install.sls b/salt/sys-cacher/install.sls index fcf6e8b..925a119 100644 --- a/salt/sys-cacher/install.sls +++ b/salt/sys-cacher/install.sls @@ -21,6 +21,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - qubes-app-shutdown-idle diff --git a/salt/sys-electrs/install-builder-source.sls b/salt/sys-electrs/install-builder-source.sls index 02b79a7..f2b29fc 100644 --- a/salt/sys-electrs/install-builder-source.sls +++ b/salt/sys-electrs/install-builder-source.sls @@ -19,6 +19,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/sys-electrs/install-source.sls b/salt/sys-electrs/install-source.sls index 2b48084..e1a5035 100644 --- a/salt/sys-electrs/install-source.sls +++ b/salt/sys-electrs/install-source.sls @@ -25,6 +25,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - socat - librocksdb-dev diff --git a/salt/sys-electrumx/install-builder.sls b/salt/sys-electrumx/install-builder.sls index 80641c6..0ae90aa 100644 --- a/salt/sys-electrumx/install-builder.sls +++ b/salt/sys-electrumx/install-builder.sls @@ -21,6 +21,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/sys-electrumx/install.sls b/salt/sys-electrumx/install.sls index 8a036bb..8dff321 100644 --- a/salt/sys-electrumx/install.sls +++ b/salt/sys-electrumx/install.sls @@ -23,6 +23,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - socat - python3-aiohttp diff --git a/salt/sys-firewall/install.sls b/salt/sys-firewall/install.sls index e6f99d9..f7034f4 100644 --- a/salt/sys-firewall/install.sls +++ b/salt/sys-firewall/install.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - fwupd-qubes-vm - qubes-core-agent-dom0-updates diff --git a/salt/sys-git/install-client.sls b/salt/sys-git/install-client.sls index d2ac6c4..bf6521b 100644 --- a/salt/sys-git/install-client.sls +++ b/salt/sys-git/install-client.sls @@ -17,6 +17,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - git - man-db diff --git a/salt/sys-git/install.sls b/salt/sys-git/install.sls index 0296e8e..1504b6b 100644 --- a/salt/sys-git/install.sls +++ b/salt/sys-git/install.sls @@ -19,6 +19,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - git - man-db diff --git a/salt/sys-gui-gpu/create.sls b/salt/sys-gui-gpu/create.sls index f2fdb32..ddf2205 100644 --- a/salt/sys-gui-gpu/create.sls +++ b/salt/sys-gui-gpu/create.sls @@ -17,6 +17,7 @@ include: pkg.installed: - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-input-proxy-sender {% if 'psu' in salt['pillar.get']('qvm:sys-gui-gpu:dummy-modules', []) %} diff --git a/salt/sys-gui-vnc/create.sls b/salt/sys-gui-vnc/create.sls index 8c79373..16d7fe5 100644 --- a/salt/sys-gui-vnc/create.sls +++ b/salt/sys-gui-vnc/create.sls @@ -17,6 +17,7 @@ include: pkg.installed: - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {% if 'psu' in salt['pillar.get']('qvm:sys-gui-vnc:dummy-modules', []) %} - dummy-psu-sender diff --git a/salt/sys-gui/create.sls b/salt/sys-gui/create.sls index 74f0962..ea7a50f 100644 --- a/salt/sys-gui/create.sls +++ b/salt/sys-gui/create.sls @@ -17,6 +17,7 @@ include: pkg.installed: - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {% if 'psu' in salt['pillar.get']('qvm:sys-gui:dummy-modules', []) %} - dummy-psu-sender diff --git a/salt/sys-gui/install.sls b/salt/sys-gui/install.sls index 1ee926b..24916d4 100644 --- a/salt/sys-gui/install.sls +++ b/salt/sys-gui/install.sls @@ -20,6 +20,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: # Qubes related packages - qubes-core-agent-passwordless-root @@ -66,6 +67,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} "{{ slsdotpath }}-lightdm-service-unit": diff --git a/salt/sys-net/install-debug.sls b/salt/sys-net/install-debug.sls index e689e56..4b67e84 100644 --- a/salt/sys-net/install-debug.sls +++ b/salt/sys-net/install-debug.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - net-tools - wireless-tools diff --git a/salt/sys-net/install-proxy.sls b/salt/sys-net/install-proxy.sls index 82a159e..44bb42e 100644 --- a/salt/sys-net/install-proxy.sls +++ b/salt/sys-net/install-proxy.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - socat diff --git a/salt/sys-net/install.sls b/salt/sys-net/install.sls index 101f3b0..cc9be47 100644 --- a/salt/sys-net/install.sls +++ b/salt/sys-net/install.sls @@ -17,6 +17,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-network-manager - wpasupplicant diff --git a/salt/sys-pgp/install.sls b/salt/sys-pgp/install.sls index 9cc9257..14c6744 100644 --- a/salt/sys-pgp/install.sls +++ b/salt/sys-pgp/install.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - split-gpg2 - gnupg2 @@ -38,6 +39,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {% endif -%} diff --git a/salt/sys-pihole/install.sls b/salt/sys-pihole/install.sls index e43d8ec..fbea98c 100644 --- a/salt/sys-pihole/install.sls +++ b/salt/sys-pihole/install.sls @@ -21,6 +21,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - fwupd-qubes-vm - qubes-core-agent-passwordless-root diff --git a/salt/sys-print/install-driver-all.sls b/salt/sys-print/install-driver-all.sls index 748ea94..d403e0d 100644 --- a/salt/sys-print/install-driver-all.sls +++ b/salt/sys-print/install-driver-all.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - printer-driver-all-enforce diff --git a/salt/sys-print/install.sls b/salt/sys-print/install.sls index 0a09f8e..961b755 100644 --- a/salt/sys-print/install.sls +++ b/salt/sys-print/install.sls @@ -20,6 +20,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: ## Discovery - qubes-core-agent-networking diff --git a/salt/sys-rsync/install-client.sls b/salt/sys-rsync/install-client.sls index 735f08d..7fa34b1 100644 --- a/salt/sys-rsync/install-client.sls +++ b/salt/sys-rsync/install-client.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - rsync - man-db diff --git a/salt/sys-rsync/install.sls b/salt/sys-rsync/install.sls index ebffbb7..8e4bfac 100644 --- a/salt/sys-rsync/install.sls +++ b/salt/sys-rsync/install.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - rsync - man-db diff --git a/salt/sys-ssh-agent/install-client.sls b/salt/sys-ssh-agent/install-client.sls index 366b388..99af712 100644 --- a/salt/sys-ssh-agent/install-client.sls +++ b/salt/sys-ssh-agent/install-client.sls @@ -19,6 +19,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates @@ -40,6 +41,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} "{{ slsdotpath }}-client-system-systemd-dir": diff --git a/salt/sys-ssh-agent/install.sls b/salt/sys-ssh-agent/install.sls index 6896865..ecf378d 100644 --- a/salt/sys-ssh-agent/install.sls +++ b/salt/sys-ssh-agent/install.sls @@ -19,6 +19,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - socat - man-db @@ -38,6 +39,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} "{{ slsdotpath }}-agent-bin-dir": diff --git a/salt/sys-ssh/install-client.sls b/salt/sys-ssh/install-client.sls index ebeca3d..e62d6ae 100644 --- a/salt/sys-ssh/install-client.sls +++ b/salt/sys-ssh/install-client.sls @@ -26,6 +26,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} "{{ slsdotpath }}-ssh-config": diff --git a/salt/sys-ssh/install.sls b/salt/sys-ssh/install.sls index 4b3b030..4f535fb 100644 --- a/salt/sys-ssh/install.sls +++ b/salt/sys-ssh/install.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - openssh-server - man-db diff --git a/salt/sys-syncthing/install-client.sls b/salt/sys-syncthing/install-client.sls index c78be41..6aa9e79 100644 --- a/salt/sys-syncthing/install-client.sls +++ b/salt/sys-syncthing/install-client.sls @@ -21,6 +21,7 @@ include: {% endif %} - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - syncthing - jq diff --git a/salt/sys-syncthing/install.sls b/salt/sys-syncthing/install.sls index e4a017b..0fccd8c 100644 --- a/salt/sys-syncthing/install.sls +++ b/salt/sys-syncthing/install.sls @@ -22,6 +22,7 @@ include: {% endif %} - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - syncthing diff --git a/salt/sys-tailscale/install.sls b/salt/sys-tailscale/install.sls index 2573488..6876aa4 100644 --- a/salt/sys-tailscale/install.sls +++ b/salt/sys-tailscale/install.sls @@ -28,6 +28,7 @@ include: - file: "{{ slsdotpath }}-systemd" - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - qubes-core-agent-passwordless-root diff --git a/salt/sys-usb/create.sls b/salt/sys-usb/create.sls index 331cbe4..f2b2292 100644 --- a/salt/sys-usb/create.sls +++ b/salt/sys-usb/create.sls @@ -18,6 +18,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-input-proxy diff --git a/salt/sys-usb/install-client-cryptsetup.sls b/salt/sys-usb/install-client-cryptsetup.sls index 5fd4112..a760af1 100644 --- a/salt/sys-usb/install-client-cryptsetup.sls +++ b/salt/sys-usb/install-client-cryptsetup.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - cryptsetup diff --git a/salt/sys-usb/install-client-fido.sls b/salt/sys-usb/install-client-fido.sls index d486dcb..11dbc44 100644 --- a/salt/sys-usb/install-client-fido.sls +++ b/salt/sys-usb/install-client-fido.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-ctap diff --git a/salt/sys-usb/install-client-proxy.sls b/salt/sys-usb/install-client-proxy.sls index f7538e5..7f910e6 100644 --- a/salt/sys-usb/install-client-proxy.sls +++ b/salt/sys-usb/install-client-proxy.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-usb-proxy - pciutils diff --git a/salt/sys-usb/install.sls b/salt/sys-usb/install.sls index a337b8d..deceb29 100644 --- a/salt/sys-usb/install.sls +++ b/salt/sys-usb/install.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - pciutils - qubes-input-proxy-sender diff --git a/salt/sys-wireguard/install.sls b/salt/sys-wireguard/install.sls index e01b6d3..807bfbc 100644 --- a/salt/sys-wireguard/install.sls +++ b/salt/sys-wireguard/install.sls @@ -17,6 +17,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/terraform/install.sls b/salt/terraform/install.sls index 5d77d5a..4f90678 100644 --- a/salt/terraform/install.sls +++ b/salt/terraform/install.sls @@ -18,6 +18,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - ca-certificates diff --git a/salt/utils/tools/builder/core.sls b/salt/utils/tools/builder/core.sls index 8e58ec0..0ddd668 100644 --- a/salt/utils/tools/builder/core.sls +++ b/salt/utils/tools/builder/core.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - qubes-core-agent-networking - qubes-core-agent-passwordless-root @@ -42,6 +43,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {% endif -%} diff --git a/salt/utils/tools/builder/doc.sls b/salt/utils/tools/builder/doc.sls index af95fef..ccd9448 100644 --- a/salt/utils/tools/builder/doc.sls +++ b/salt/utils/tools/builder/doc.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - pandoc - ronn diff --git a/salt/utils/tools/zsh/install.sls b/salt/utils/tools/zsh/install.sls index 649e649..48a41b0 100644 --- a/salt/utils/tools/zsh/install.sls +++ b/salt/utils/tools/zsh/install.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - zsh - zsh-autosuggestions diff --git a/salt/vault/install.sls b/salt/vault/install.sls index 1a10cb6..40cfa67 100644 --- a/salt/vault/install.sls +++ b/salt/vault/install.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - keepassxc - gnupg2 @@ -36,6 +37,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {{ pkg.pkg|sequence|yaml }} {% endif -%} diff --git a/salt/video-companion/create.sls b/salt/video-companion/create.sls index 571fb2a..1b104c2 100644 --- a/salt/video-companion/create.sls +++ b/salt/video-companion/create.sls @@ -11,5 +11,6 @@ include: pkg.installed: - require: - sls: utils.tools.common.update + - setopt: "install_weak_deps=False" - pkgs: - qubes-video-companion-dom0 diff --git a/salt/video-companion/install-receiver-debug.sls b/salt/video-companion/install-receiver-debug.sls index 5b802f2..a17fc0b 100644 --- a/salt/video-companion/install-receiver-debug.sls +++ b/salt/video-companion/install-receiver-debug.sls @@ -16,6 +16,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: - cheese diff --git a/salt/video-companion/install-receiver.sls b/salt/video-companion/install-receiver.sls index 6abd4c0..687a18f 100644 --- a/salt/video-companion/install-receiver.sls +++ b/salt/video-companion/install-receiver.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {% if grains['os_family']|lower == 'debian' -%} - qubes-video-companion diff --git a/salt/video-companion/install-sender.sls b/salt/video-companion/install-sender.sls index cd7c47e..c8b0691 100644 --- a/salt/video-companion/install-sender.sls +++ b/salt/video-companion/install-sender.sls @@ -15,6 +15,7 @@ include: - sls: utils.tools.common.update - install_recommends: False - skip_suggestions: True + - setopt: "install_weak_deps=False" - pkgs: {% if grains['os_family']|lower == 'debian' -%} - qubes-video-companion