diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-17 08:14:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-17 08:14:05 +0100 |
| commit | 55e10e3b5962ccbc52400392c383c15417d46f35 (patch) | |
| tree | cded61e59bb7a936d299ab3a8518ca80577a77d8 /src | |
| parent | 03202504d559417266e437bbf53eb26ade187c07 (diff) | |
| parent | 8e0a54676ff2ac90b7c24e4f05b05bcebc584bd3 (diff) | |
| download | vyos-1x-55e10e3b5962ccbc52400392c383c15417d46f35.tar.gz vyos-1x-55e10e3b5962ccbc52400392c383c15417d46f35.zip | |
Merge pull request #2646 from sarthurdev/kea_fixes
dhcp: T3316: Kea DHCP and DHCPv6 fixes
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/dhcp_server.py | 11 | ||||
| -rwxr-xr-x | src/conf_mode/dhcpv6_server.py | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py index 66f7c8057..958e90014 100755 --- a/src/conf_mode/dhcp_server.py +++ b/src/conf_mode/dhcp_server.py @@ -21,7 +21,6 @@ from ipaddress import ip_network from netaddr import IPAddress from netaddr import IPRange from sys import exit -from time import sleep from vyos.config import Config from vyos.pki import wrap_certificate @@ -29,7 +28,6 @@ from vyos.pki import wrap_private_key from vyos.template import render from vyos.utils.dict import dict_search from vyos.utils.dict import dict_search_args -from vyos.utils.file import chmod_775 from vyos.utils.file import write_file from vyos.utils.process import call from vyos.utils.process import run @@ -362,15 +360,6 @@ def apply(dhcp): call(f'systemctl {action} {service}.service') - # op-mode needs ctrl socket permission change - i = 0 - while not os.path.exists(ctrl_socket): - if i > 15: - break - i += 1 - sleep(1) - chmod_775(ctrl_socket) - return None if __name__ == '__main__': diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py index 73a708ff5..b01f510e5 100755 --- a/src/conf_mode/dhcpv6_server.py +++ b/src/conf_mode/dhcpv6_server.py @@ -19,13 +19,11 @@ import os from ipaddress import ip_address from ipaddress import ip_network from sys import exit -from time import sleep from vyos.config import Config from vyos.template import render from vyos.template import is_ipv6 from vyos.utils.process import call -from vyos.utils.file import chmod_775 from vyos.utils.file import write_file from vyos.utils.dict import dict_search from vyos.utils.network import is_subnet_connected @@ -197,15 +195,6 @@ def apply(dhcpv6): call(f'systemctl restart {service_name}') - # op-mode needs ctrl socket permission change - i = 0 - while not os.path.exists(ctrl_socket): - if i > 15: - break - i += 1 - sleep(1) - chmod_775(ctrl_socket) - return None if __name__ == '__main__': |