From e0684c0c343835c7674a94424d847592511915b0 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 9 Jul 2026 22:21:52 +0200 Subject: utils: T9008: migrate remaining cmd() callers to cmdl() and remove cmd() Complete the safer-subprocess migration started by the cmdl()/ifconfig refactoring and convert every remaining vyos.utils.process.cmd() call site to the list-based cmdl(). Drop the vyos.utils.process.cmd() implementation as it is no longer in use. --- src/services/vyos-domain-resolver | 4 ++-- src/services/vyos-netlinkd | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/services') diff --git a/src/services/vyos-domain-resolver b/src/services/vyos-domain-resolver index 60fcb7df4..004ee09b8 100755 --- a/src/services/vyos-domain-resolver +++ b/src/services/vyos-domain-resolver @@ -31,7 +31,7 @@ from vyos.utils.dict import dict_search_args from vyos.utils.kernel import WIREGUARD_REKEY_AFTER_TIME from vyos.utils.file import makedir, chmod_775, write_file, read_file from vyos.utils.network import is_valid_ipv4_address_or_range, is_valid_ipv6_address_or_range -from vyos.utils.process import cmd +from vyos.utils.process import cmdl from vyos.utils.process import run from vyos.xml_ref import get_defaults @@ -117,7 +117,7 @@ def nft_output(table, set_name, ip_list): def nft_valid_sets(): try: valid_sets = [] - sets_json = cmd('nft --json list sets') + sets_json = cmdl(['nft', '--json', 'list', 'sets']) sets_obj = json.loads(sets_json) for obj in sets_obj['nftables']: diff --git a/src/services/vyos-netlinkd b/src/services/vyos-netlinkd index ddc8b1bf3..2cad26070 100755 --- a/src/services/vyos-netlinkd +++ b/src/services/vyos-netlinkd @@ -34,7 +34,7 @@ from vyos.ifconfig import Section from vyos.utils.boot import boot_configuration_complete from vyos.utils.commit import commit_in_progress2 from vyos.utils.dict import dict_search -from vyos.utils.process import cmd +from vyos.utils.process import cmdl from vyos.utils.process import is_systemd_service_active from vyos.utils.process import stop_systemd_unit @@ -149,7 +149,7 @@ def _handle_dhcp_events(operstate: Optional[str], ifname: str) -> None: # we will re-start the service and thus cancel the backoff time. if 'dhcp' in tmp: syslog.syslog(syslog.LOG_DEBUG, f'Restarting {systemdV4_service}...') - cmd(f'systemctl restart {systemdV4_service}') + cmdl(['systemctl', 'restart', systemdV4_service]) if 'dhcpv6' in tmp: v6_restart = True @@ -158,7 +158,7 @@ def _handle_dhcp_events(operstate: Optional[str], ifname: str) -> None: if v6_restart: syslog.syslog(syslog.LOG_DEBUG, f'Restarting {systemdV6_service}...') - cmd(f'systemctl restart {systemdV6_service}') + cmdl(['systemctl', 'restart', systemdV6_service]) return None -- cgit v1.2.3