summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/dhcp_server.py13
-rwxr-xr-xsrc/conf_mode/dhcpv6_server.py9
2 files changed, 12 insertions, 10 deletions
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py
index c2a188812..bf86e484b 100755
--- a/src/conf_mode/dhcp_server.py
+++ b/src/conf_mode/dhcp_server.py
@@ -28,7 +28,8 @@ from vyos import ConfigError
config_file = r'/etc/dhcp/dhcpd.conf'
lease_file = r'/config/dhcpd.leases'
-daemon_config_file = r'/etc/default/isc-dhcp-server'
+pid_file = r'/var/run/dhcpd.pid'
+daemon_config_file = r'/etc/default/isc-dhcpv4-server'
# Please be careful if you edit the template.
config_tmpl = """
@@ -231,10 +232,10 @@ shared-network {{ network.name }} {
daemon_tmpl = """
### Autogenerated by dhcp_server.py ###
-# sourced by /etc/init.d/isc-dhcp-server
+# sourced by /etc/init.d/isc-dhcpv4-server
-DHCPD_CONF=/etc/dhcp/dhcpd.conf
-DHCPD_PID=/var/run/dhcpd.pid
+DHCPD_CONF={{ config_file }}
+DHCPD_PID={{ pid_file }}
OPTIONS="-4 -lf {{ lease_file }}"
INTERFACES=""
"""
@@ -827,7 +828,7 @@ def generate(dhcp):
def apply(dhcp):
if (dhcp is None) or dhcp['disabled']:
# DHCP server is removed in the commit
- os.system('sudo systemctl stop isc-dhcp-server.service')
+ os.system('sudo systemctl stop isc-dhcpv4-server.service')
if os.path.exists(config_file):
os.unlink(config_file)
if os.path.exists(daemon_config_file):
@@ -837,7 +838,7 @@ def apply(dhcp):
if not os.path.exists(lease_file):
os.mknod(lease_file)
- os.system('sudo systemctl restart isc-dhcp-server.service')
+ os.system('sudo systemctl restart isc-dhcpv4-server.service')
return None
diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index 039321430..44a927789 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2018 VyOS maintainers and contributors
+# Copyright (C) 2018-2019 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
@@ -29,6 +29,7 @@ from vyos import ConfigError
config_file = r'/etc/dhcp/dhcpdv6.conf'
lease_file = r'/config/dhcpdv6.leases'
+pid_file = r'/var/run/dhcpdv6.pid'
daemon_config_file = r'/etc/default/isc-dhcpv6-server'
# Please be careful if you edit the template.
@@ -115,12 +116,12 @@ shared-network {{ network.name }} {
"""
daemon_tmpl = """
-### Autogenerated by dhcp_server.py ###
+### Autogenerated by dhcpv6_server.py ###
# sourced by /etc/init.d/isc-dhcpv6-server
-DHCPD_CONF=/etc/dhcp/dhcpdv6.conf
-DHCPD_PID=/var/run/dhcpdv6.pid
+DHCPD_CONF={{ config_file }}
+DHCPD_PID={{ pid_file }}
OPTIONS="-6 -lf {{ lease_file }}"
INTERFACES=""
"""