diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/etc/ipsec.d/vti-up-down | 4 | ||||
| -rwxr-xr-x | src/op_mode/dhcp.py | 3 | ||||
| -rw-r--r-- | src/systemd/vyos-grub-update.service | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/etc/ipsec.d/vti-up-down b/src/etc/ipsec.d/vti-up-down index 441b316c2..01e9543c9 100755 --- a/src/etc/ipsec.d/vti-up-down +++ b/src/etc/ipsec.d/vti-up-down @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2021-2023 VyOS maintainers and contributors +# Copyright (C) 2021-2024 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 @@ -57,7 +57,9 @@ if __name__ == '__main__': if 'disable' not in vti: tmp = VTIIf(interface) tmp.update(vti) + call(f'sudo ip link set {interface} up') else: + call(f'sudo ip link set {interface} down') syslog(f'Interface {interface} is admin down ...') elif verb in ['down-client', 'down-host']: if vti_link_up: diff --git a/src/op_mode/dhcp.py b/src/op_mode/dhcp.py index d6b8aa0b8..b1fa6b918 100755 --- a/src/op_mode/dhcp.py +++ b/src/op_mode/dhcp.py @@ -79,8 +79,7 @@ def _get_raw_server_leases(family='inet', pool=None, sorted=None, state=[], orig """ lease_file = '/config/dhcpdv6.leases' if family == 'inet6' else '/config/dhcpd.leases' data = [] - leases = IscDhcpLeases(lease_file).get() - + leases = IscDhcpLeases(lease_file).get(include_backups=True) if pool is None: pool = _get_dhcp_pools(family=family) aux = False diff --git a/src/systemd/vyos-grub-update.service b/src/systemd/vyos-grub-update.service index 522b13a33..7b67ae1b8 100644 --- a/src/systemd/vyos-grub-update.service +++ b/src/systemd/vyos-grub-update.service @@ -6,9 +6,9 @@ Before=vyos-router.service [Service] Type=oneshot ExecStart=/usr/libexec/vyos/system/grub_update.py -TimeoutSec=5 +TimeoutSec=60 KillMode=process StandardOutput=journal+console [Install] -WantedBy=vyos-router.service
\ No newline at end of file +WantedBy=vyos-router.service |