Skip to content

Few fixes that got missed out during Fedora to Ubuntu mkosi image migration#3100

Open
bpradipt wants to merge 2 commits into
confidential-containers:mainfrom
bpradipt:ubuntu-mkosi
Open

Few fixes that got missed out during Fedora to Ubuntu mkosi image migration#3100
bpradipt wants to merge 2 commits into
confidential-containers:mainfrom
bpradipt:ubuntu-mkosi

Conversation

@bpradipt
Copy link
Copy Markdown
Member

No description provided.

bpradipt added 2 commits May 27, 2026 12:35
Ubuntu's openssh-server does not ship sshd-keygen@.service, so the
existing Fedora-style override has no effect. Add ssh-host-keys.service
(oneshot) to generate rsa/ecdsa/ed25519 keys in /run/ssh, a ssh.service
drop-in to order ssh.service after key generation, and a systemd preset
to enable ssh.service

Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
Ubuntu's openssh-server does not ship sshd-keygen@.service, so the
existing sshd-keygen@.service.d override in mkosi.skeleton-sftp has
no effect on Ubuntu. Add ssh-host-keys.service (oneshot) and a
ssh.service drop-in using the same pattern introduced for the debug
image, so host keys are generated in /run/ssh before ssh.service
starts.

The sshd-keygen@.service.d override is retained for Fedora.

Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
@bpradipt bpradipt requested a review from a team as a code owner May 27, 2026 12:37
@stevenhorsman
Copy link
Copy Markdown
Member

@bpradipt - thanks for the updates. Do you think they need to go into 0.21.1, or are they okay to be in the dev code (e.g. for the debug image fix) until 0.22 release?

@bpradipt
Copy link
Copy Markdown
Member Author

@bpradipt - thanks for the updates. Do you think they need to go into 0.21.1, or are they okay to be in the dev code (e.g. for the debug image fix) until 0.22 release?

No need for this to go in 0.21.1.

Copy link
Copy Markdown
Member

@stevenhorsman stevenhorsman left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks

Copy link
Copy Markdown
Contributor

@Amulyam24 Amulyam24 left a comment

Choose a reason for hiding this comment

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

LGTM, Thank you @bpradipt!

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