diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-05 07:23:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-05 07:23:34 +0200 |
| commit | 487c817ea320ddabcdaf41a8112937a29c19443e (patch) | |
| tree | 804576d13ce30511ef21c10cb71026290561e52c /src/conf_mode/dhcp_server.py | |
| parent | 77937079d93abd86cf44bf6eb72d9afed741b1cb (diff) | |
| parent | c07055258b853de641d2a1353582800b24c514d2 (diff) | |
| download | vyos-1x-487c817ea320ddabcdaf41a8112937a29c19443e.tar.gz vyos-1x-487c817ea320ddabcdaf41a8112937a29c19443e.zip | |
Merge pull request #2184 from sever-sever/T2958
T2958: Refactor DHCP-server systemd unit and lease
Diffstat (limited to 'src/conf_mode/dhcp_server.py')
| -rwxr-xr-x | src/conf_mode/dhcp_server.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py index c4c72aae9..ac7d95632 100755 --- a/src/conf_mode/dhcp_server.py +++ b/src/conf_mode/dhcp_server.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2022 VyOS maintainers and contributors +# Copyright (C) 2018-2023 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 @@ -34,6 +34,7 @@ from vyos import airbag airbag.enable() config_file = '/run/dhcp-server/dhcpd.conf' +systemd_override = r'/run/systemd/system/isc-dhcp-server.service.d/10-override.conf' def dhcp_slice_range(exclude_list, range_dict): """ @@ -295,6 +296,7 @@ def generate(dhcp): # render the "real" configuration render(config_file, 'dhcp-server/dhcpd.conf.j2', dhcp, formater=lambda _: _.replace(""", '"')) + render(systemd_override, 'dhcp-server/10-override.conf.j2', dhcp) # Clean up configuration test file if os.path.exists(tmp_file): @@ -303,6 +305,7 @@ def generate(dhcp): return None def apply(dhcp): + call('systemctl daemon-reload') # bail out early - looks like removal from running config if not dhcp or 'disable' in dhcp: call('systemctl stop isc-dhcp-server.service') |