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.

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

[branched] overrides: fast-track systemd-256.5-1.fc41 #3116

Merged
merged 1 commit into from
Aug 22, 2024

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Aug 21, 2024

systemd v256 added a new userdb functionality where SSH authorized
keys can be part of a User Record. To make this transparently
work with sshd authentication, an sshd config dropin that sets an
AuthorizedKeysCommand directive was added.

Unfortunately, it was added with a higher priority than intended,
which meant that it overrode the AuthorizedKeysCommand directive from
ssh-key-dir, which is how our ~/.ssh/authorized_keys.d/ magic works
today with Ignition and Afterburn. So the end result is that this broke
SSH which of course broke kola too.

This is tracked in upstream systemd at:

systemd/systemd#33648

The dropin was recently reverted in Fedora:

https://src.fedoraproject.org/rpms/systemd/c/38291e13c1dec15618b7d09e4217d10076897cdf?branch=f41

Fast-track the latest f41 systemd build with that change.

We'll need to keep an eye on the conversation there to make sure that
the final solution doesn't re-break FCOS, but we would notice it pretty
quickly too.

Closes: coreos/fedora-coreos-tracker#1775

marmijo
marmijo previously approved these changes Aug 21, 2024
Copy link
Member

@marmijo marmijo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

systemd v256 added a new userdb functionality where SSH authorized
keys can be part of a User Record. To make this transparently
work with sshd authentication, an sshd config dropin that sets an
`AuthorizedKeysCommand` directive was added.

Unfortunately, it was added with a higher priority than intended,
which meant that it overrode the `AuthorizedKeysCommand` directive from
`ssh-key-dir`, which is how our `~/.ssh/authorized_keys.d/` magic works
today with Ignition and Afterburn. So the end result is that this broke
SSH which of course broke kola too.

This is tracked in upstream systemd at:

systemd/systemd#33648

The dropin was recently reverted in Fedora:

https://src.fedoraproject.org/rpms/systemd/c/38291e13c1dec15618b7d09e4217d10076897cdf?branch=f41

Fast-track the latest f41 systemd build with that change.

We'll need to keep an eye on the conversation there to make sure that
the final solution doesn't re-break FCOS, but we would notice it pretty
quickly too.

Closes: coreos/fedora-coreos-tracker#1775
@jlebon jlebon force-pushed the pr/systemd-drop-branched branch from d809b73 to 8faac0e Compare August 22, 2024 00:09
@jlebon jlebon changed the title [branched] overrides: drop systemd pins [branched] overrides: fast-track systemd-256.5-1.fc41 Aug 22, 2024
@travier
Copy link
Member

travier commented Aug 22, 2024

Let's merge this one first and then I'll rebase #3109

@jlebon jlebon merged commit 209e9c6 into coreos:branched Aug 22, 2024
1 check passed
@jlebon jlebon deleted the pr/systemd-drop-branched branch August 22, 2024 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants