diff options
| author | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-09 19:08:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 20:08:24 +0200 |
| commit | 9875a21bdb26df19f2faf3e81153dea15e4f9e3c (patch) | |
| tree | 8a1ecc1b318d80db156f397c34bc75f40c184728 /src/conf_mode/ssh.py | |
| parent | c8a86d3ccee63b972c36346e6cb1c712c6801ad2 (diff) | |
| download | vyos-1x-9875a21bdb26df19f2faf3e81153dea15e4f9e3c.tar.gz vyos-1x-9875a21bdb26df19f2faf3e81153dea15e4f9e3c.zip | |
util: T2226: os.system was wrongly converted to run
os.system does print the ouput of the command, run() does not.
A new function called call() does the printing and return the error code.
Diffstat (limited to 'src/conf_mode/ssh.py')
| -rwxr-xr-x | src/conf_mode/ssh.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/conf_mode/ssh.py b/src/conf_mode/ssh.py index a85dcd7f2..a6cdb7ccc 100755 --- a/src/conf_mode/ssh.py +++ b/src/conf_mode/ssh.py @@ -21,7 +21,7 @@ from sys import exit from vyos.config import Config from vyos.defaults import directories as vyos_data_dir from vyos import ConfigError -from vyos.util import run +from vyos.util import call config_file = r'/etc/ssh/sshd_config' @@ -133,10 +133,10 @@ def generate(ssh): def apply(ssh): if ssh is not None and 'port' in ssh.keys(): - run("sudo systemctl restart ssh.service") + call("sudo systemctl restart ssh.service") else: # SSH access is removed in the commit - run("sudo systemctl stop ssh.service") + call("sudo systemctl stop ssh.service") if os.path.isfile(config_file): os.unlink(config_file) |