From 4a2a06f400593107393755777fdd42b57bbaa21b Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Thu, 19 Sep 2019 12:51:14 -0500 Subject: [boot-config-loader] T1622: (bugfix) set gid and write permissions Set gid and permissions so that vyatta-cfg group has access to the active config; fix typo in arg len check; reorganize; add log output. --- python/vyos/configsession.py | 6 ++++-- python/vyos/defaults.py | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'python/vyos') diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py index acbdd3d5f..09fae78a1 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -145,7 +145,8 @@ class ConfigSession(object): self.__run_command([COMMENT] + path + value) def commit(self): - self.__run_command([COMMIT]) + out = self.__run_command([COMMIT]) + return out def discard(self): self.__run_command([DISCARD]) @@ -157,4 +158,5 @@ class ConfigSession(object): return config_data def load_config(self, file_path): - self.__run_command(LOAD_CONFIG + [file_path]) + out = self.__run_command(LOAD_CONFIG + [file_path]) + return out diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py index 85d27d60d..dedb929b4 100644 --- a/python/vyos/defaults.py +++ b/python/vyos/defaults.py @@ -20,6 +20,7 @@ directories = { "config": "/opt/vyatta/etc/config", "current": "/opt/vyatta/etc/config-migrate/current", "migrate": "/opt/vyatta/etc/config-migrate/migrate", + "log": "/var/log/vyatta", } cfg_group = 'vyattacfg' -- cgit v1.2.3