diff options
| -rwxr-xr-x | src/conf_mode/dhcp_server.py | 15 | ||||
| -rw-r--r-- | src/systemd/isc-dhcp-server.service | 3 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py index aaa5ad3b3..39f2921cd 100755 --- a/src/conf_mode/dhcp_server.py +++ b/src/conf_mode/dhcp_server.py @@ -24,8 +24,8 @@ from sys import exit from vyos.config import Config from vyos.validate import is_subnet_connected from vyos import ConfigError -from vyos.util import call from vyos.template import render +from vyos.util import call, chown config_file = r'/run/dhcp-server/dhcpd.conf' @@ -445,7 +445,7 @@ def get_config(): return dhcp def verify(dhcp): - if (dhcp is None) or (dhcp['disabled'] is True): + if not dhcp or dhcp['disabled']: return None # If DHCP is enabled we need one share-network @@ -591,12 +591,12 @@ def verify(dhcp): return None def generate(dhcp): - if not dhcp: + if not dhcp or dhcp['disabled']: return None - if dhcp['disabled'] is True: - print('Warning: DHCP server will be deactivated because it is disabled') - return None + dirname = os.path.dirname(config_file) + if not os.path.isdir(dirname): + os.mkdir(dirname) # Please see: https://phabricator.vyos.net/T1129 for quoting of the raw parameters # we can pass to ISC DHCPd @@ -610,8 +610,9 @@ def apply(dhcp): call('systemctl stop isc-dhcp-server.service') if os.path.exists(config_file): os.unlink(config_file) + return None - call('systemctl restart isc-dhcp-server.service') + call('systemctl restart isc-dhcp-server.service') return None if __name__ == '__main__': diff --git a/src/systemd/isc-dhcp-server.service b/src/systemd/isc-dhcp-server.service index 39a97fb4e..4c3cb9920 100644 --- a/src/systemd/isc-dhcp-server.service +++ b/src/systemd/isc-dhcp-server.service @@ -7,8 +7,7 @@ After=time-sync.target ConditionPathExists=/run/dhcp-server/dhcpd.conf [Service] - -RuntimeDirectory=dhcp-server +WorkingDirectory=/run/dhcp-server # The leases files need to be root:vyattacfg even when dropping privileges ExecStart=/bin/sh -ec '\ CONFIG_FILE=/run/dhcp-server/dhcpd.conf; \ |