diff options
| author | Michael Adler <therisen06@gmail.com> | 2019-12-11 09:34:35 +0100 |
|---|---|---|
| committer | Michael Adler <michael.adler@siemens.com> | 2020-05-06 11:32:17 +0200 |
| commit | 7915dc737ca769b0b25e59702a520aff7080b650 (patch) | |
| tree | 5b9e1b0b36f5041a8e1d8d1d0055f13d226b8f09 /nixos/modules/system | |
| parent | 7e66125815d225d5620f986af4d4dda9c60f9562 (diff) | |
| download | nixlib-7915dc737ca769b0b25e59702a520aff7080b650.tar nixlib-7915dc737ca769b0b25e59702a520aff7080b650.tar.gz nixlib-7915dc737ca769b0b25e59702a520aff7080b650.tar.bz2 nixlib-7915dc737ca769b0b25e59702a520aff7080b650.tar.lz nixlib-7915dc737ca769b0b25e59702a520aff7080b650.tar.xz nixlib-7915dc737ca769b0b25e59702a520aff7080b650.tar.zst nixlib-7915dc737ca769b0b25e59702a520aff7080b650.zip | |
nixos/systemd: use global proxy config in systemd-importd
Diffstat (limited to 'nixos/modules/system')
| -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 df20a433d524..ffc5387e8102 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"; |