diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-05-28 16:02:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 16:02:40 +0200 |
| commit | 95a248c56f83105e63038fd83761997bc1b41ea3 (patch) | |
| tree | 2190d2df170a767b8cb3911a4e7f4b2d31c052d0 /meson.build | |
| parent | test: lock device when sfdisk or mkfs (diff) | |
| parent | meson: don't put a symlink pointing to '20-systemd-userdb.conf' in /etc in al... (diff) | |
| download | systemd-95a248c56f83105e63038fd83761997bc1b41ea3.tar.xz systemd-95a248c56f83105e63038fd83761997bc1b41ea3.zip | |
Merge pull request #33008 from fbuihuu/optionally-link-ssh-dropins
Optionally link ssh dropins
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meson.build b/meson.build index 499f0f4d79..f17c8798cc 100644 --- a/meson.build +++ b/meson.build @@ -204,11 +204,13 @@ sshconfdir = get_option('sshconfdir') if sshconfdir == '' sshconfdir = sysconfdir / 'ssh/ssh_config.d' endif +conf.set10('LINK_SSH_PROXY_DROPIN', sshconfdir != 'no' and not sshconfdir.startswith('/usr/')) sshdconfdir = get_option('sshdconfdir') if sshdconfdir == '' sshdconfdir = sysconfdir / 'ssh/sshd_config.d' endif +conf.set10('LINK_SSHD_USERDB_DROPIN', sshdconfdir != 'no' and not sshdconfdir.startswith('/usr/')) sshdprivsepdir = get_option('sshdprivsepdir') conf.set10('CREATE_SSHDPRIVSEPDIR', sshdprivsepdir != 'no' and not sshdprivsepdir.startswith('/usr/')) |