diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2024-01-30 11:25:19 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2024-01-30 18:56:21 +0100 |
| commit | 62670a7752fdcdf1bd4eb81c3afe4080fa945a04 (patch) | |
| tree | 465d92c9f69b850ee7b6d22834405e8890fa82c7 /tmpfiles.d | |
| parent | test: explicitly set nsec3-iterations to 0 (diff) | |
| download | systemd-62670a7752fdcdf1bd4eb81c3afe4080fa945a04.tar.xz systemd-62670a7752fdcdf1bd4eb81c3afe4080fa945a04.zip | |
meson: don't install broken tmpfiles config with sshd?confdir == 'no'
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 6c7fc5d5f2.
Diffstat (limited to 'tmpfiles.d')
| -rw-r--r-- | tmpfiles.d/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index d05ea94c16..bec24ac7b4 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -34,8 +34,8 @@ in_files = [['etc.conf', ''], ['static-nodes-permissions.conf', ''], ['systemd.conf', ''], ['var.conf', ''], - ['20-systemd-userdb.conf', 'ENABLE_USERDB'], - ['20-systemd-ssh-generator.conf', ''], + ['20-systemd-userdb.conf', 'ENABLE_SSH_USERDB_CONFIG'], + ['20-systemd-ssh-generator.conf', 'ENABLE_SSH_PROXY_CONFIG'], ] foreach pair : in_files |