diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:42 +0000 |
| commit | 78e9bb837c258ac0ec7712b3d612cc2f407e731e (patch) | |
| tree | f515d16b6efd858a9aeb5b0ef5d6f90bf288283d /tmpfiles.d | |
| parent | Adding debian version 255.5-1. (diff) | |
| download | systemd-78e9bb837c258ac0ec7712b3d612cc2f407e731e.tar.xz systemd-78e9bb837c258ac0ec7712b3d612cc2f407e731e.zip | |
Merging upstream version 256.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tmpfiles.d')
| -rw-r--r-- | tmpfiles.d/20-systemd-ssh-generator.conf.in | 15 | ||||
| -rw-r--r-- | tmpfiles.d/20-systemd-userdb.conf.in | 12 | ||||
| -rw-r--r-- | tmpfiles.d/meson.build | 2 | ||||
| -rw-r--r-- | tmpfiles.d/systemd-network.conf | 6 |
4 files changed, 32 insertions, 3 deletions
diff --git a/tmpfiles.d/20-systemd-ssh-generator.conf.in b/tmpfiles.d/20-systemd-ssh-generator.conf.in new file mode 100644 index 0000000..dbe354a --- /dev/null +++ b/tmpfiles.d/20-systemd-ssh-generator.conf.in @@ -0,0 +1,15 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See tmpfiles.d(5) for details + +{% if LINK_SSH_PROXY_DROPIN %} +L {{SSHCONFDIR}}/20-systemd-ssh-proxy.conf - - - - {{LIBEXECDIR}}/ssh_config.d/20-systemd-ssh-proxy.conf +{% endif %} +{% if CREATE_SSHDPRIVSEPDIR %} +d {{SSHDPRIVSEPDIR}} 0755 +{% endif %} diff --git a/tmpfiles.d/20-systemd-userdb.conf.in b/tmpfiles.d/20-systemd-userdb.conf.in new file mode 100644 index 0000000..c344c1b --- /dev/null +++ b/tmpfiles.d/20-systemd-userdb.conf.in @@ -0,0 +1,12 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See tmpfiles.d(5) for details + +{% if LINK_SSHD_USERDB_DROPIN %} +L {{SSHDCONFDIR}}/20-systemd-userdb.conf - - - - {{LIBEXECDIR}}/sshd_config.d/20-systemd-userdb.conf +{% endif %} diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index 4c11ad6..bec24ac 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -34,6 +34,8 @@ in_files = [['etc.conf', ''], ['static-nodes-permissions.conf', ''], ['systemd.conf', ''], ['var.conf', ''], + ['20-systemd-userdb.conf', 'ENABLE_SSH_USERDB_CONFIG'], + ['20-systemd-ssh-generator.conf', 'ENABLE_SSH_PROXY_CONFIG'], ] foreach pair : in_files diff --git a/tmpfiles.d/systemd-network.conf b/tmpfiles.d/systemd-network.conf index b30bc91..323beca 100644 --- a/tmpfiles.d/systemd-network.conf +++ b/tmpfiles.d/systemd-network.conf @@ -7,7 +7,7 @@ # See tmpfiles.d(5) for details -d /run/systemd/netif 0755 systemd-network systemd-network - -d /run/systemd/netif/links 0755 systemd-network systemd-network - +d /run/systemd/netif 0755 systemd-network systemd-network - +d /run/systemd/netif/links 0755 systemd-network systemd-network - d /run/systemd/netif/leases 0755 systemd-network systemd-network - -d /run/systemd/netif/lldp 0755 systemd-network systemd-network - +d /var/lib/systemd/network 0755 systemd-network systemd-network - |