update_agent: handle new output format for loginctl #1059
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cgwalters
reviewed
Aug 15, 2023
dustymabe
force-pushed
the
dusty-fix-loginctl
branch
2 times, most recently
from
6db7656
to
497b06f
Compare
In systemd 254 the `loginctl list-sessions --json` output was modified slightly:
Before
```
[{"session":"4","uid":1000,"user":"core","seat":"","tty":""}]
```
After
```
[{"session":"17","uid":1000,"user":"core","seat":"","tty":"n/a","state":"active","idle":false,"since":null}]
```
Notice the change from `""` to `"n/a"` for the `tty` field.
This change probably happened in one of:
- systemd/systemd#27769
- systemd/systemd#27740
- systemd/systemd#27606
Let's update the code to handle the new case and rename the function to
be a little more appropriate since the use case for it is narrow.
Fixes coreos/fedora-coreos-tracker#1547
dustymabe
force-pushed
the
dusty-fix-loginctl
branch
from
497b06f
to
f0c479f
Compare
cgwalters
approved these changes
Aug 15, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In systemd 254 the
loginctl list-sessions --jsonoutput was modified slightly:Before
After
Notice the change from
""to"n/a"for thettyfield.This change probably happened in one of:
loginctl list-sessionssystemd/systemd#27740Let's update the code to handle the new case.
Fixes coreos/fedora-coreos-tracker#1547