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

meson: don't install broken tmpfiles config with sshconfdir == 'no' #31125

Merged
merged 1 commit into from Jan 30, 2024

Conversation

mrc0mmand
Copy link
Member

20-systemd-ssh-generator.conf expands SSHCONFDIR, which is bogus when we build with -Dsshconfdir=no.

Follow-up 6c7fc5d.

@github-actions github-actions bot added build-system meson please-review PR is ready for (re-)review by a maintainer labels Jan 30, 2024
@poettering
Copy link
Member

poettering commented Jan 30, 2024

this looks good, but I think we need something symmetric for the sshdconfdir=='no' case, i.e. 20-systemd-userdb.conf should also be condition by a new ENABLE_USERDB_SSHD_CONFIG conditional or so?

@poettering poettering added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed please-review PR is ready for (re-)review by a maintainer labels Jan 30, 2024
@mrc0mmand
Copy link
Member Author

mrc0mmand commented Jan 30, 2024

this looks good, but I think we need something symmetric for the sshdconfdir=='no' case, i.e. 20-systemd-userdb.conf should also be condition by a new ENABLE_USERDB_SSHD_CONFIG conditional or so?

Ah, indeed, will push a fix shortly.

20-systemd-ssh-generator.conf expands SSHCONFDIR, which is bogus when we
build with -Dsshconfdir=no. Similarly, avoid expanding SSHDCONFDIR in
20-systemd-userdb.conf when building with -Dsshconfdir=no.

Follow-up 6c7fc5d.
@poettering
Copy link
Member

thanks! lgtm

@bluca bluca merged commit 62670a7 into systemd:main Jan 30, 2024
45 of 49 checks passed
@github-actions github-actions bot removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Jan 30, 2024
@mrc0mmand mrc0mmand deleted the meson-more-ssh-shenanigans branch January 30, 2024 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

4 participants