diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:25:12 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:25:12 +0100 |
| commit | 75847af961fd61daa63b26e8bafb1237df85a7fb (patch) | |
| tree | 63deca295e8b843518cde30cadc2f1df15c6d273 /src/conf_mode/dhcp_server.py | |
| parent | 60e61ed1247c4f8efdd1805b1e1f2dda5ed2472c (diff) | |
| parent | 214e63fbad5f1ed008543ba0eec56d1aa6649745 (diff) | |
| download | vyos-1x-vyos/1.3dev0.tar.gz vyos-1x-vyos/1.3dev0.zip | |
Merge branch 'equuleus' of github.com:vyos/vyos-1x into currentvyos/1.3dev0
* 'equuleus' of github.com:vyos/vyos-1x:
T1873: DHCP: add current year to copyright notice
T1873: DHCP: fix service name in op-mode "show dhcp"
T1873: DHCP: ship our own server init scripts
vyos.config: T1862: restore regex after merge
equuleus: T1862: Use regex pattern \s+ to split strings on whitespace
[vyos.config] T1758: adjust regex for change in Python 3.7
Jenkins: Docker: always pull container from Dockerhub
ssh - T1719: ssh deprecated options removed
Jenkins: assume dependencies are available in Docker container
Jenkins: fix httpURI in isCustomBuild()
openvpn: T1617: bugfix for server push-route
openvpn: T1548: remove authy 2fa provider
update Jenkins file for equuleus
igmpproxy: remove init script which is already provided by Debian Buster
Diffstat (limited to 'src/conf_mode/dhcp_server.py')
| -rwxr-xr-x | src/conf_mode/dhcp_server.py | 13 |
1 files changed, 7 insertions, 6 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 |