diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-08-08 10:02:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-08 10:02:38 +0100 |
| commit | 7b9d5f016624a4811de326568d6ca93cf073aef0 (patch) | |
| tree | 791485a1f37a90649bcd2446f2973d83945f17c7 | |
| parent | 7a546896cb971ede7e1003bd7d0ce1f0485cbd72 (diff) | |
| parent | 6543f444c42ff45e8115366256643186bf1dd567 (diff) | |
| download | vyos-1x-7b9d5f016624a4811de326568d6ca93cf073aef0.tar.gz vyos-1x-7b9d5f016624a4811de326568d6ca93cf073aef0.zip | |
Merge pull request #3955 from jestabro/configd-in-session-false
configd: T6640: enforce in_session returns False under configd
| -rw-r--r-- | python/vyos/configsource.py | 2 | ||||
| -rwxr-xr-x | src/services/vyos-configd | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/python/vyos/configsource.py b/python/vyos/configsource.py index f582bdfab..59e5ac8a1 100644 --- a/python/vyos/configsource.py +++ b/python/vyos/configsource.py @@ -204,6 +204,8 @@ class ConfigSourceSession(ConfigSource): Returns: True if called from a configuration session, False otherwise. """ + if os.getenv('VYOS_CONFIGD', ''): + return False try: self._run(self._make_command('inSession', '')) return True diff --git a/src/services/vyos-configd b/src/services/vyos-configd index a4b839a7f..69ee15bf1 100755 --- a/src/services/vyos-configd +++ b/src/services/vyos-configd @@ -267,6 +267,8 @@ if __name__ == '__main__': cfg_group = grp.getgrnam(CFG_GROUP) os.setgid(cfg_group.gr_gid) + os.environ['VYOS_CONFIGD'] = 't' + def sig_handler(signum, frame): shutdown() |