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.
This commit is contained in:
Frantisek Sumsal
2024-01-30 11:25:19 +01:00
committed by Luca Boccassi
parent cb3244c0dc
commit 62670a7752
4 changed files with 7 additions and 4 deletions

View File

@@ -1669,6 +1669,9 @@ conf.set10('ENABLE_NSS', enable_nss)
conf.set10('ENABLE_TIMEDATECTL', get_option('timedated') or get_option('timesyncd'))
conf.set10('ENABLE_SSH_PROXY_CONFIG', sshconfdir != 'no')
conf.set10('ENABLE_SSH_USERDB_CONFIG', conf.get('ENABLE_USERDB') == 1 and sshdconfdir != 'no')
conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests)
#####################################################################

View File

@@ -11,7 +11,7 @@ executables += [
},
]
if sshconfdir != 'no'
if conf.get('ENABLE_SSH_PROXY_CONFIG') == 1
custom_target(
'20-systemd-ssh-proxy.conf',
input : '20-systemd-ssh-proxy.conf.in',

View File

@@ -24,7 +24,7 @@ executables += [
},
]
if conf.get('ENABLE_USERDB') == 1 and sshdconfdir != 'no'
if conf.get('ENABLE_SSH_USERDB_CONFIG') == 1
custom_target(
'20-systemd-userdb.conf',
input : '20-systemd-userdb.conf.in',

View File

@@ -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