diff options
| -rw-r--r-- | hosts/vidhar/dsl.nix | 16 |
1 files 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 { | |||
| 129 | bindsTo = [ "sys-subsystem-net-devices-telekom.device" ]; | 129 | bindsTo = [ "sys-subsystem-net-devices-telekom.device" ]; |
| 130 | after = [ "sys-subsystem-net-devices-telekom.device" ]; | 130 | after = [ "sys-subsystem-net-devices-telekom.device" ]; |
| 131 | }; | 131 | }; |
| 132 | systemd.services."dhcpcd-telekom" = { | 132 | systemd.services."dhcpcd-${pppInterface}" = { |
| 133 | wantedBy = [ "multi-user.target" "network-online.target" "pppd-telekom.service" ]; | 133 | wantedBy = [ "multi-user.target" "network-online.target" "pppd-telekom.service" ]; |
| 134 | bindsTo = [ "pppd-telekom.service" "sys-subsystem-net-devices-${pppInterface}.device" ]; | 134 | bindsTo = [ "pppd-telekom.service" "sys-subsystem-net-devices-${pppInterface}.device" ]; |
| 135 | after = [ "pppd-telekom.service" "sys-subsystem-net-devices-${pppInterface}.device" ]; | 135 | after = [ "pppd-telekom.service" "sys-subsystem-net-devices-${pppInterface}.device" ]; |
| @@ -180,7 +180,7 @@ in { | |||
| 180 | ''; | 180 | ''; |
| 181 | in { | 181 | in { |
| 182 | Type = "forking"; | 182 | Type = "forking"; |
| 183 | PIDFile = "/run/dhcpcd/pid"; | 183 | PIDFile = "/var/run/dhcpcd/${pppInterface}.pid"; |
| 184 | RuntimeDirectory = "dhcpcd"; | 184 | RuntimeDirectory = "dhcpcd"; |
| 185 | ExecStart = "@${pkgs.dhcpcd}/sbin/dhcpcd dhcpcd -q --config ${dhcpcdConf} ${pppInterface}"; | 185 | ExecStart = "@${pkgs.dhcpcd}/sbin/dhcpcd dhcpcd -q --config ${dhcpcdConf} ${pppInterface}"; |
| 186 | ExecReload = "${pkgs.dhcpcd}/sbin/dhcpcd --rebind ${pppInterface}"; | 186 | ExecReload = "${pkgs.dhcpcd}/sbin/dhcpcd --rebind ${pppInterface}"; |
| @@ -189,9 +189,9 @@ in { | |||
| 189 | }; | 189 | }; |
| 190 | }; | 190 | }; |
| 191 | systemd.services.ndppd = { | 191 | systemd.services.ndppd = { |
| 192 | wantedBy = [ "dhcpcd-telekom.service" ]; | 192 | wantedBy = [ "dhcpcd-${pppInterface}.service" ]; |
| 193 | bindsTo = [ "dhcpcd-telekom.service" ]; | 193 | bindsTo = [ "dhcpcd-${pppInterface}.service" ]; |
| 194 | after = [ "dhcpcd-telekom.service" ]; | 194 | after = [ "dhcpcd-${pppInterface}.service" ]; |
| 195 | 195 | ||
| 196 | serviceConfig = { | 196 | serviceConfig = { |
| 197 | Restart = "always"; | 197 | Restart = "always"; |
| @@ -199,9 +199,9 @@ in { | |||
| 199 | }; | 199 | }; |
| 200 | }; | 200 | }; |
| 201 | systemd.services.corerad = { | 201 | systemd.services.corerad = { |
| 202 | wantedBy = [ "dhcpcd-telekom.service" ]; | 202 | wantedBy = [ "dhcpcd-${pppInterface}.service" ]; |
| 203 | bindsTo = [ "dhcpcd-telekom.service" ]; | 203 | bindsTo = [ "dhcpcd-${pppInterface}.service" ]; |
| 204 | after = [ "dhcpcd-telekom.service" ]; | 204 | after = [ "dhcpcd-${pppInterface}.service" ]; |
| 205 | 205 | ||
| 206 | serviceConfig = { | 206 | serviceConfig = { |
| 207 | Restart = lib.mkForce "always"; | 207 | Restart = lib.mkForce "always"; |
