Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions package-managers/qubes-download-dom0-updates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ elif [ -f "$DOM0_UPDATES_DIR/etc/yum.conf" ]; then
fi
# DNF uses /etc/yum.repos.d, even when --installroot is specified
OPTS+=("--setopt=reposdir=$DOM0_UPDATES_DIR/etc/yum.repos.d")
OPTS+=("--setopt=cachedir=$DOM0_UPDATES_DIR/var/cache/dnf")
CLEAN_OPTS=("${OPTS[@]}")
# DNF verifies signatures implicitly, but yumdownloader does not.
SIGNATURE_REGEX=""
Expand Down Expand Up @@ -64,14 +65,6 @@ while [ -n "$1" ]; do
shift
done

if [ -e /run/qubes-service/whonix-gateway ]; then
# DNF (or rather curl) refuses to resolve onion addresses directly, use
# socks proxy to avoid the issue
OPTS+=( --setopt=proxy=socks5h://127.0.0.1:9050/ )
# for stream isolation
OPTS+=( --setopt=proxy_username=dom0updates --setopt=proxy_password=dom0updates )
fi

if [ -z "$UPDATE_ACTION" ]; then
UPDATE_ACTION=upgrade
fi
Expand Down
8 changes: 0 additions & 8 deletions qubes-rpc/qvm-template-repo-query
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,6 @@ fi

OPTS+=(-y "--setopt=reposdir=${repodir}" --quiet)

if [ -e /run/qubes-service/whonix-gateway ]; then
# DNF (or rather curl) refuses to resolve onion addresses directly, use
# socks proxy to avoid the issue
OPTS+=( --setopt=proxy=socks5h://127.0.0.1:9050/ )
# for stream isolation
OPTS+=( --setopt=proxy_username=dom0updates --setopt=proxy_password=dom0updates )
fi

if ! $DNF5; then
# use vendored 'downloadurl' dnf-plugin (fork of 'download' plugin), to print
# all mirrors
Expand Down