linse/boxtools
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix execute argument in unix_cmd

Browse Source
This commit is contained in:
zolliker
2025-05-20 08:17:35 +02:00
parent d8d4394e03
commit 1a6b133afa
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils.py
View File

@ -231,14 +231,14 @@ def check_service(service, set_on=None, execute=None):
active = True active = True
if set_on: if set_on:
if not active: if not active:
unix_cmd(f'systemctl start {service}', execute) unix_cmd(f'systemctl start {service}', execute=execute)
if not enabled: if not enabled:
unix_cmd(f'systemctl enable {service}', execute) unix_cmd(f'systemctl enable {service}', execute=execute)
elif set_on is not None: elif set_on is not None:
if active: if active:
unix_cmd(f'systemctl stop {service}', execute) unix_cmd(f'systemctl stop {service}', execute=execute)
if enabled: if enabled:
unix_cmd(f'systemctl disable {service}', execute) unix_cmd(f'systemctl disable {service}', execute=execute)
return active, enabled return active, enabled
@ -279,8 +279,8 @@ def change_firewall(set_on, ports, execute=None):
with open('f{FIREWALL_CONF}.tmp', 'w') as f: with open('f{FIREWALL_CONF}.tmp', 'w') as f:
f.write(content.replace(prevline, line)) f.write(content.replace(prevline, line))
os.rename('f{FIREWALL_CONF}.tmp', FIREWALL_CONF) os.rename('f{FIREWALL_CONF}.tmp', FIREWALL_CONF)
unix_cmd('systemctl restart nftables', execute) unix_cmd('systemctl restart nftables', execute=execute)
unix_cmd('systemctl enable nftables', execute) unix_cmd('systemctl enable nftables', execute=execute)
elif ports - prevportset: elif ports - prevportset:
print('need sudo rights to modify firewall') print('need sudo rights to modify firewall')
return True return True