Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

configd: T6640: enforce in_session returns False under configd (backport #3955) #3959

Merged
merged 1 commit into from
Aug 12, 2024
Merged

configd: T6640: enforce in_session returns False under configd (backport #3955) #3959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions python/vyos/configsource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,8 @@ def in_session(self):
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
Expand Down
2 changes: 2 additions & 0 deletions src/services/vyos-configd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
Loading