diff options
author | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-05 14:36:29 +0100 |
---|---|---|
committer | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-06 20:22:35 +0100 |
commit | aceb0817a65bf01669cada3ceb60d65b81607bc3 (patch) | |
tree | 5418d4537cfc14115536315909fbb7a83277fe7a /src/op_mode/connect_disconnect.py | |
parent | 356950579c2b155f9d41c04ed63c7efde561b43a (diff) | |
download | vyos-1x-aceb0817a65bf01669cada3ceb60d65b81607bc3.tar.gz vyos-1x-aceb0817a65bf01669cada3ceb60d65b81607bc3.zip |
util: T2226: covert most calls from os.system to util
As little change a possible but the function call
The behaviour should be totally unchanged.
Diffstat (limited to 'src/op_mode/connect_disconnect.py')
-rwxr-xr-x | src/op_mode/connect_disconnect.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/op_mode/connect_disconnect.py b/src/op_mode/connect_disconnect.py index a22615096..192fd80ec 100755 --- a/src/op_mode/connect_disconnect.py +++ b/src/op_mode/connect_disconnect.py @@ -21,6 +21,9 @@ from sys import exit from psutil import process_iter from time import strftime, localtime, time +from vyos.util import run + + PPP_LOGFILE = '/var/log/vyatta/ppp_{}.log' def check_interface(interface): @@ -56,8 +59,7 @@ def connect(interface): tm = strftime("%a %d %b %Y %I:%M:%S %p %Z", localtime(time())) with open(PPP_LOGFILE.format(interface), 'a') as f: f.write('{}: user {} started PPP daemon for {} by connect command\n'.format(tm, user, interface)) - cmd = 'umask 0; setsid sh -c "nohup /usr/sbin/pppd call {0} > /tmp/{0}.log 2>&1 &"'.format(interface) - os.system(cmd) + run('umask 0; setsid sh -c "nohup /usr/sbin/pppd call {0} > /tmp/{0}.log 2>&1 &"'.format(interface)) def disconnect(interface): @@ -75,8 +77,7 @@ def disconnect(interface): tm = strftime("%a %d %b %Y %I:%M:%S %p %Z", localtime(time())) with open(PPP_LOGFILE.format(interface), 'a') as f: f.write('{}: user {} stopped PPP daemon for {} by disconnect command\n'.format(tm, user, interface)) - cmd = '/usr/bin/poff "{}"'.format(interface) - os.system(cmd) + run('/usr/bin/poff "{}"'.format(interface)) def main(): parser = argparse.ArgumentParser() |