diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-16 09:13:12 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-16 09:13:12 +0100 |
| commit | b5aaaf87a7741f1c20672c584ca08a01fa1a1129 (patch) | |
| tree | 8cd4b2948285c21ad71abb1258dd5d41f17fdc01 /nixos/modules/services/networking | |
| parent | 90252481bfe233c3fe5a54f9d6d73e93f08e1e27 (diff) | |
| parent | 2b851d14d9f7fa09120a407fecf3a81cea12bebe (diff) | |
| download | nixlib-b5aaaf87a7741f1c20672c584ca08a01fa1a1129.tar nixlib-b5aaaf87a7741f1c20672c584ca08a01fa1a1129.tar.gz nixlib-b5aaaf87a7741f1c20672c584ca08a01fa1a1129.tar.bz2 nixlib-b5aaaf87a7741f1c20672c584ca08a01fa1a1129.tar.lz nixlib-b5aaaf87a7741f1c20672c584ca08a01fa1a1129.tar.xz nixlib-b5aaaf87a7741f1c20672c584ca08a01fa1a1129.tar.zst nixlib-b5aaaf87a7741f1c20672c584ca08a01fa1a1129.zip | |
Merge staging and PR #35021
It's the last staging commit (mostly) built on Hydra, and a minimal fix for Darwin regression in pysqlite.
Diffstat (limited to 'nixos/modules/services/networking')
| -rw-r--r-- | nixos/modules/services/networking/radvd.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 0199502163a3..85d7f9e4a41b 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -59,24 +59,11 @@ in systemd.services.radvd = { description = "IPv6 Router Advertisement Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - path = [ pkgs.radvd ]; - - preStart = '' - mkdir -m 755 -p /run/radvd - chown radvd /run/radvd - ''; - serviceConfig = - { ExecStart = "@${pkgs.radvd}/sbin/radvd radvd" - + " -p /run/radvd/radvd.pid -m syslog -u radvd -C ${confFile}"; + { ExecStart = "@${pkgs.radvd}/bin/radvd radvd -n -u radvd -C ${confFile}"; Restart = "always"; - Type = "forking"; - PIDFile = "/run/radvd/radvd.pid"; }; }; |