diff options
| author | Lulu Cathrinus Grimalkin <me@erkin.party> | 2021-12-16 17:32:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-16 17:32:24 +0300 |
| commit | 9737a55f6dde490e7fdf1c9d5c5733e48c94d141 (patch) | |
| tree | d2c24363d921490bcef5cb3efb70ae794fbe22a5 /python/vyos/configsource.py | |
| parent | 95b91627a6065b720365c9ae7d124d85fc8e493d (diff) | |
| parent | 55f8ede2d09a9ad095f9ec5c2a729f8c5fb6aafa (diff) | |
| download | vyos-1x-9737a55f6dde490e7fdf1c9d5c5733e48c94d141.tar.gz vyos-1x-9737a55f6dde490e7fdf1c9d5c5733e48c94d141.zip | |
Merge branch 'vyos:current' into current
Diffstat (limited to 'python/vyos/configsource.py')
| -rw-r--r-- | python/vyos/configsource.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/vyos/configsource.py b/python/vyos/configsource.py index b0981d25e..a0f6a46b5 100644 --- a/python/vyos/configsource.py +++ b/python/vyos/configsource.py @@ -19,6 +19,7 @@ import re import subprocess from vyos.configtree import ConfigTree +from vyos.util import boot_configuration_complete class VyOSError(Exception): """ @@ -117,7 +118,7 @@ class ConfigSourceSession(ConfigSource): # Running config can be obtained either from op or conf mode, it always succeeds # once the config system is initialized during boot; # before initialization, set to empty string - if os.path.isfile('/tmp/vyos-config-status'): + if boot_configuration_complete(): try: running_config_text = self._run([self._cli_shell_api, '--show-active-only', '--show-show-defaults', '--show-ignore-edit', 'showConfig']) except VyOSError: |