Skip to content
Merged
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
3 changes: 2 additions & 1 deletion network/update-proxy-configs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ if [ -d /etc/pacman.d ]; then
#!/bin/bash
### This file is automatically generated by Qubes ($0 script).
### All modifications here will be lost.
exec env ALL_PROXY=$PROXY_ADDR /usr/bin/pacman "\$@"
exec env ALL_PROXY=\${ALL_PROXY:-$PROXY_ADDR} NO_PROXY=\${NO_PROXY:-127.0.0.1} /usr/bin/pacman "\$@"
EOF
chmod +x /run/qubes/bin/pacman
cat > /etc/profile.d/qubes-proxy.sh << EOF
Expand Down Expand Up @@ -155,6 +155,7 @@ fi
if [ -e /etc/portage/make.conf ]; then
update_conf /etc/portage/make.conf "http_proxy=\"$PROXY_ADDR\"
https_proxy=\"$PROXY_ADDR\"
no_proxy=\"${NO_PROXY:-127.0.0.1}\"
Copy link
Member

@marmarek marmarek Mar 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see it documented in make.conf(5) man page, do you have any source for this?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not documented on that manpage but wget does support it (see gitlab link in separate reply).

RSYNC_PROXY=\"${PROXY_ADDR_BASE}\""

# Current workaround for gpg not resolving key servers used behing proxy
Expand Down