From 8ac1901c7876170d464f016cb98714365bcb895d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 31 Dec 2021 16:27:15 +0100
Subject: vidhar: ...

---
 hosts/vidhar/dsl.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hosts/vidhar/dsl.nix b/hosts/vidhar/dsl.nix
index f424d1f3..4f781422 100644
--- a/hosts/vidhar/dsl.nix
+++ b/hosts/vidhar/dsl.nix
@@ -129,7 +129,7 @@ in {
       bindsTo = [ "sys-subsystem-net-devices-telekom.device" ];
       after = [ "sys-subsystem-net-devices-telekom.device" ];
     };
-    systemd.services."dhcpcd-telekom" = {
+    systemd.services."dhcpcd-${pppInterface}" = {
       wantedBy = [ "multi-user.target" "network-online.target" "pppd-telekom.service" ];
       bindsTo = [ "pppd-telekom.service" "sys-subsystem-net-devices-${pppInterface}.device" ];
       after = [ "pppd-telekom.service" "sys-subsystem-net-devices-${pppInterface}.device" ];
@@ -180,7 +180,7 @@ in {
         '';
       in {
         Type = "forking";
-        PIDFile = "/run/dhcpcd/pid";
+        PIDFile = "/var/run/dhcpcd/${pppInterface}.pid";
         RuntimeDirectory = "dhcpcd";
         ExecStart = "@${pkgs.dhcpcd}/sbin/dhcpcd dhcpcd -q --config ${dhcpcdConf} ${pppInterface}";
         ExecReload = "${pkgs.dhcpcd}/sbin/dhcpcd --rebind ${pppInterface}";
@@ -189,9 +189,9 @@ in {
       };
     };
     systemd.services.ndppd = {
-      wantedBy = [ "dhcpcd-telekom.service" ];
-      bindsTo = [ "dhcpcd-telekom.service" ];
-      after = [ "dhcpcd-telekom.service" ];
+      wantedBy = [ "dhcpcd-${pppInterface}.service" ];
+      bindsTo = [ "dhcpcd-${pppInterface}.service" ];
+      after = [ "dhcpcd-${pppInterface}.service" ];
 
       serviceConfig = {
         Restart = "always";
@@ -199,9 +199,9 @@ in {
       };
     };
     systemd.services.corerad = {
-      wantedBy = [ "dhcpcd-telekom.service" ];
-      bindsTo = [ "dhcpcd-telekom.service" ];
-      after = [ "dhcpcd-telekom.service" ];
+      wantedBy = [ "dhcpcd-${pppInterface}.service" ];
+      bindsTo = [ "dhcpcd-${pppInterface}.service" ];
+      after = [ "dhcpcd-${pppInterface}.service" ];
 
       serviceConfig = {
         Restart = lib.mkForce "always";
-- 
cgit v1.2.3