summaryrefslogtreecommitdiff
path: root/src/systemd
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-11-29 12:30:35 +0100
committerChristian Poessinger <christian@poessinger.com>2020-11-29 12:30:35 +0100
commitcacbc208d0802806de2c671e41607d605138aaa5 (patch)
treeb7e479ade5f090b69830e19c24b575ed7ea1fed3 /src/systemd
parentb474b60a8c4240858d8abdcdbeb555b85452a517 (diff)
parentd6974be8d96cae21dde6bfa40fe568db3d3ef04f (diff)
downloadvyos-1x-cacbc208d0802806de2c671e41607d605138aaa5.tar.gz
vyos-1x-cacbc208d0802806de2c671e41607d605138aaa5.zip
Merge branch 'dhcp-relay' of github.com:c-po/vyos-1x into current
* 'dhcp-relay' of github.com:c-po/vyos-1x: dhcp-relay: T3095: migrate service to get_config_dict() smoketest: dhcp-relay: T3095: initial tests
Diffstat (limited to 'src/systemd')
-rw-r--r--src/systemd/isc-dhcp-relay.service4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/systemd/isc-dhcp-relay.service b/src/systemd/isc-dhcp-relay.service
index 56bcec840..de2e51a87 100644
--- a/src/systemd/isc-dhcp-relay.service
+++ b/src/systemd/isc-dhcp-relay.service
@@ -3,7 +3,7 @@ Description=ISC DHCP IPv4 relay
Documentation=man:dhcrelay(8)
Wants=network-online.target
RequiresMountsFor=/run
-ConditionPathExists=/run/dhcp-relay/dhcp.conf
+ConditionPathExists=/run/dhcp-relay/dhcrelay.conf
After=vyos-router.service
[Service]
@@ -11,7 +11,7 @@ Type=forking
WorkingDirectory=/run/dhcp-relay
RuntimeDirectory=dhcp-relay
RuntimeDirectoryPreserve=yes
-EnvironmentFile=/run/dhcp-relay/dhcp.conf
+EnvironmentFile=/run/dhcp-relay/dhcrelay.conf
PIDFile=/run/dhcp-relay/dhcrelay.pid
ExecStart=/usr/sbin/dhcrelay -4 -pf /run/dhcp-relay/dhcrelay.pid $OPTIONS
Restart=always