Skip to content

Conversation

@ani-sinha
Copy link
Contributor

Proposed Commit Message

disable-sshd-keygen-if-cloud-init-active.conf seems to have been added twice. Fix it.

Merge type

  • Squash merge using "Proposed Commit Message"
  • Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

Copy link
Member

@holmanb holmanb left a comment

Choose a reason for hiding this comment

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

Nice catch, thanks.

@xiachen-rh
Copy link
Contributor

Hi @ani-sinha
Is "%{_unitdir}" better?
for line 118
%config(noreplace) /usr/lib/systemd/system/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf
--->
%config(noreplace) %{_unitdir}/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf

@ani-sinha
Copy link
Contributor Author

Hi @ani-sinha Is "%{_unitdir}" better? for line 118 %config(noreplace) /usr/lib/systemd/system/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf ---> %config(noreplace) %{_unitdir}/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf

Done! Thanks for pointing this out Amy!

…-init-active.conf

disable-sshd-keygen-if-cloud-init-active.conf seems to have been added twice.
Fix it.

Also replace '/usr/lib/systemd/system' by the macro %{_unitdir} to make the
spec file more portable across distros.

Signed-off-by: Ani Sinha <anisinha@redhat.com>
@github-actions github-actions bot added the stale-pr Pull request is stale; will be auto-closed soon label Dec 20, 2025
@canonical canonical deleted a comment from github-actions bot Dec 20, 2025
@github-actions github-actions bot removed the stale-pr Pull request is stale; will be auto-closed soon label Dec 21, 2025
@github-actions
Copy link

github-actions bot commented Jan 4, 2026

Hello! Thank you for this proposed change to cloud-init. This pull request is now marked as stale as it has not seen any activity in 14 days. If no activity occurs within the next 7 days, this pull request will automatically close.

If you are waiting for code review and you are seeing this message, apologies! Please reply, tagging blackboxsw, and he will ensure that someone takes a look soon.

(If the pull request is closed and you would like to continue working on it, please do tag blackboxsw to reopen it.)

@github-actions github-actions bot added the stale-pr Pull request is stale; will be auto-closed soon label Jan 4, 2026
@holmanb holmanb removed the stale-pr Pull request is stale; will be auto-closed soon label Jan 5, 2026
@holmanb holmanb merged commit 0717357 into canonical:main Jan 5, 2026
21 checks passed
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