summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-11-29 12:04:36 +0100
committerChristian Poessinger <christian@poessinger.com>2020-11-29 12:12:02 +0100
commit8f8629227c0631cf75d896af1e1413b330f82781 (patch)
treefb7a7a1b0a8c3f0f267745e55703006300f83799 /src
parente4ea410b7587b0018055962c295ab491133f458c (diff)
downloadvyos-1x-8f8629227c0631cf75d896af1e1413b330f82781.tar.gz
vyos-1x-8f8629227c0631cf75d896af1e1413b330f82781.zip
smoketest: dhcp-relay: T3095: initial tests
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/dhcp_relay.py4
-rw-r--r--src/systemd/isc-dhcp-relay.service4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/dhcp_relay.py b/src/conf_mode/dhcp_relay.py
index 352865b9d..34b3fabb7 100755
--- a/src/conf_mode/dhcp_relay.py
+++ b/src/conf_mode/dhcp_relay.py
@@ -26,7 +26,7 @@ from vyos import ConfigError
from vyos import airbag
airbag.enable()
-config_file = r'/run/dhcp-relay/dhcp.conf'
+config_file = r'/run/dhcp-relay/dhcrelay.conf'
default_config_data = {
'interface': [],
@@ -104,7 +104,7 @@ def generate(relay):
if not relay:
return None
- render(config_file, 'dhcp-relay/config.tmpl', relay)
+ render(config_file, 'dhcp-relay/dhcrelay.conf.tmpl', relay)
return None
def apply(relay):
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