diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-10 10:35:50 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-10 10:35:50 +0200 |
commit | e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad (patch) | |
tree | 1e346767b4a6882a24fe41f73a9cfd283c007aea /nixos/modules/system/boot | |
parent | 4416712772fbd893413342a2b8e5064c0c174b77 (diff) | |
parent | 80b51d983ae77f47910ba26305023efbfdb62e91 (diff) | |
download | nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar.gz nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar.bz2 nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar.lz nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar.xz nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar.zst nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system/boot')
-rw-r--r-- | nixos/modules/system/boot/networkd.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 14a3832b0dc..f1aa9064bef 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -669,7 +669,7 @@ let }; }; - commonMatchText = def: '' + commonMatchText = def: optionalString (def.matchConfig != {}) '' [Match] ${attrsToSection def.matchConfig} ''; |