summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-12-31 16:27:15 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2021-12-31 16:27:15 +0100
commit8ac1901c7876170d464f016cb98714365bcb895d (patch)
treed1276453f015e3d793bc9b1df718a81e710c4947
parentfd81189815c71ddab8b1bdff5ffd6874090c5c7e (diff)
downloadnixos-8ac1901c7876170d464f016cb98714365bcb895d.tar
nixos-8ac1901c7876170d464f016cb98714365bcb895d.tar.gz
nixos-8ac1901c7876170d464f016cb98714365bcb895d.tar.bz2
nixos-8ac1901c7876170d464f016cb98714365bcb895d.tar.xz
nixos-8ac1901c7876170d464f016cb98714365bcb895d.zip
vidhar: ...
-rw-r--r--hosts/vidhar/dsl.nix16
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";