diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-15 11:36:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-15 11:36:31 -0500 |
| commit | a3e434014977a9d178d650920bc60dda2289d420 (patch) | |
| tree | 6f5c4ed4edb234dfcf236789cdc2401a7500d2a1 /nixos | |
| parent | 44361ea4091ecfbde4b2262fe6c65d1932813808 (diff) | |
| parent | b75a9599b4e858244caa0979f8fa224b5ca36c54 (diff) | |
| download | nixlib-a3e434014977a9d178d650920bc60dda2289d420.tar nixlib-a3e434014977a9d178d650920bc60dda2289d420.tar.gz nixlib-a3e434014977a9d178d650920bc60dda2289d420.tar.bz2 nixlib-a3e434014977a9d178d650920bc60dda2289d420.tar.lz nixlib-a3e434014977a9d178d650920bc60dda2289d420.tar.xz nixlib-a3e434014977a9d178d650920bc60dda2289d420.tar.zst nixlib-a3e434014977a9d178d650920bc60dda2289d420.zip | |
Merge pull request #39536 from teto/iproute
[RDY] iproute: copy files in /etc
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1809.xml | 5 | ||||
| -rw-r--r-- | nixos/modules/config/iproute2.nix | 23 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 1 |
3 files changed, 28 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index fd998b1b3183..0ae630945db2 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -53,7 +53,10 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <itemizedlist> <listitem> - <para></para> + <para>When enabled the <literal>iproute2</literal> will copy the files + expected by ip route (e.g., <filename>rt_tables</filename>) in + <filename>/run/iproute2</filename>. This allows to write aliases for + routing tables for instance.</para> </listitem> </itemizedlist> </section> diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix new file mode 100644 index 000000000000..881ad671a627 --- /dev/null +++ b/nixos/modules/config/iproute2.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.iproute2; + confDir = "/run/iproute2"; +in +{ + options.networking.iproute2.enable = mkEnableOption "copy IP route configuration files"; + + config = mkMerge [ + ({ nixpkgs.config.iproute2.confDir = confDir; }) + + (mkIf cfg.enable { + system.activationScripts.iproute2 = '' + cp -R ${pkgs.iproute}/etc/iproute2 ${confDir} + chmod -R 664 ${confDir} + chmod +x ${confDir} + ''; + }) + ]; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 04881d6db369..5e0c3c369d7b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -9,6 +9,7 @@ ./config/fonts/ghostscript.nix ./config/gnu.nix ./config/i18n.nix + ./config/iproute2.nix ./config/krb5/default.nix ./config/ldap.nix ./config/networking.nix |