diff options
| author | Florian Klink <flokli@flokli.de> | 2020-05-06 13:37:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 13:37:05 +0200 |
| commit | 274a62a2beced120c4dab20704d2879b2387fdad (patch) | |
| tree | 039c1e1de66f079781bcfa4f66c920c7868030d8 /nixos | |
| parent | 69dc7e64ad9fbe0a6ee928f4f033350110c39cd9 (diff) | |
| parent | 7915dc737ca769b0b25e59702a520aff7080b650 (diff) | |
Merge pull request #75487 from michaeladler/nixos-unstable
nixos/systemd: use global proxy config in systemd-importd
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index df20a433d5243..ffc5387e8102f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -405,6 +405,8 @@ let "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock" ]; + proxy_env = config.networking.proxy.envVars; + in { @@ -1056,6 +1058,7 @@ in systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; 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. systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; |