public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75487 from michaeladler/nixos-unstable

Browse Source 
nixos/systemd: use global proxy config in systemd-importd
This commit is contained in:
Florian Klink 2020-05-06 13:37:05 +02:00 committed by GitHub
commit 274a62a2be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/system/boot/systemd.nix
View File

@ -405,6 +405,8 @@ let
"hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock" "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock"
]; ];
proxy_env = config.networking.proxy.envVars;
in in
{ {
@ -1056,6 +1058,7 @@ in
systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; systemd.targets.network-online.wantedBy = [ "multi-user.target" ];
systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ];
systemd.services.systemd-importd.environment = proxy_env;
# Don't bother with certain units in containers. # Don't bother with certain units in containers.
systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";