summaryrefslogtreecommitdiff
path: root/src/helpers/vyos-boot-config-loader.py
diff options
context:
space:
mode:
authorThomas Mangin <thomas.mangin@exa.net.uk>2020-04-05 17:44:20 +0100
committerThomas Mangin <thomas.mangin@exa.net.uk>2020-04-06 20:22:35 +0100
commit6057aff92b7961945ed21628c5185d5fe01f57a4 (patch)
tree38c88c355da2befe79a3dfb65cf622230e48406d /src/helpers/vyos-boot-config-loader.py
parentbd471c2db5c341d6702bc06575a88a6c5579d2de (diff)
downloadvyos-1x-6057aff92b7961945ed21628c5185d5fe01f57a4.tar.gz
vyos-1x-6057aff92b7961945ed21628c5185d5fe01f57a4.zip
util: T2226: rewrite boot config loader to use cmd
Diffstat (limited to 'src/helpers/vyos-boot-config-loader.py')
-rwxr-xr-xsrc/helpers/vyos-boot-config-loader.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/helpers/vyos-boot-config-loader.py b/src/helpers/vyos-boot-config-loader.py
index 58483fe50..c5bf22f10 100755
--- a/src/helpers/vyos-boot-config-loader.py
+++ b/src/helpers/vyos-boot-config-loader.py
@@ -20,13 +20,13 @@ import os
import sys
import pwd
import grp
-import subprocess
import traceback
from datetime import datetime
from vyos.defaults import directories
from vyos.configsession import ConfigSession, ConfigSessionError
from vyos.configtree import ConfigTree
+from vyos.util import cmd
STATUS_FILE = '/tmp/vyos-config-status'
TRACE_FILE = '/tmp/boot-config-trace'
@@ -102,12 +102,7 @@ def failsafe(config_file_name):
'authentication',
'encrypted-password'])
- cmd = ("useradd -s /bin/bash -G 'users,sudo' -m -N -p '{0}' "
- "vyos".format(passwd))
- try:
- subprocess.check_call(cmd, shell=True)
- except subprocess.CalledProcessError as e:
- sys.exit("{0}".format(e))
+ cmd(f"useradd -s /bin/bash -G 'users,sudo' -m -N -p '{passwd}' vyos")
if __name__ == '__main__':
if len(sys.argv) < 2: