diff --git a/tmpfiles.d/20-systemd-shell-extra.conf.in b/tmpfiles.d/20-systemd-shell-extra.conf.in index 8ebe83dd69..02f1ef5802 100644 --- a/tmpfiles.d/20-systemd-shell-extra.conf.in +++ b/tmpfiles.d/20-systemd-shell-extra.conf.in @@ -8,5 +8,5 @@ # See tmpfiles.d(5) for details {% if LINK_SHELL_EXTRA_DROPIN %} -L {{SHELLPROFILEDIR}}/70-systemd-shell-extra.sh - - - - {{LIBEXECDIR}}/profile.d/70-systemd-shell-extra.sh +L$ {{SHELLPROFILEDIR}}/70-systemd-shell-extra.sh - - - - {{LIBEXECDIR}}/profile.d/70-systemd-shell-extra.sh {% endif %} diff --git a/tmpfiles.d/20-systemd-ssh-generator.conf.in b/tmpfiles.d/20-systemd-ssh-generator.conf.in index dbe354a2d2..8c9d3af1c3 100644 --- a/tmpfiles.d/20-systemd-ssh-generator.conf.in +++ b/tmpfiles.d/20-systemd-ssh-generator.conf.in @@ -8,7 +8,7 @@ # 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 +L$ {{SSHCONFDIR}}/20-systemd-ssh-proxy.conf - - - - {{LIBEXECDIR}}/ssh_config.d/20-systemd-ssh-proxy.conf {% endif %} {% if CREATE_SSHDPRIVSEPDIR %} d {{SSHDPRIVSEPDIR}} 0755 diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in index 4f2c0d7c43..ec2f7aea72 100644 --- a/tmpfiles.d/legacy.conf.in +++ b/tmpfiles.d/legacy.conf.in @@ -13,7 +13,7 @@ d /run/lock 0755 root root - L /var/lock - - - - ../run/lock {% if CREATE_LOG_DIRS %} -L /var/log/README - - - - ../..{{DOC_DIR}}/README.logs +L$ /var/log/README - - - - ../..{{DOC_DIR}}/README.logs {% endif %} # /run/lock/subsys is used for serializing SysV service execution, and diff --git a/tmpfiles.d/systemd-network.conf b/tmpfiles.d/systemd-network.conf index 323beca59c..5898e88de5 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/leases 0755 systemd-network systemd-network - -d /var/lib/systemd/network 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$ /var/lib/systemd/network 0755 systemd-network systemd-network - diff --git a/tmpfiles.d/systemd-nspawn.conf b/tmpfiles.d/systemd-nspawn.conf index 78bd1c670e..6549ea4101 100644 --- a/tmpfiles.d/systemd-nspawn.conf +++ b/tmpfiles.d/systemd-nspawn.conf @@ -19,5 +19,5 @@ Q /var/lib/machines 0700 - - - # systemd-nspawn --ephemeral places snapshots) we are more strict, to # avoid removing unrelated temporary files. -R! /var/lib/machines/.#* -R! /.#machine.* +R!$ /var/lib/machines/.#* +R!$ /.#machine.* diff --git a/tmpfiles.d/systemd-tmp.conf b/tmpfiles.d/systemd-tmp.conf index d47d468fba..093830586c 100644 --- a/tmpfiles.d/systemd-tmp.conf +++ b/tmpfiles.d/systemd-tmp.conf @@ -14,10 +14,10 @@ x /var/tmp/systemd-private-%b-* X /var/tmp/systemd-private-%b-*/tmp # Remove top-level private temporary directories on each boot -R! /tmp/systemd-private-* -R! /var/tmp/systemd-private-* +R!$ /tmp/systemd-private-* +R!$ /var/tmp/systemd-private-* # Handle lost systemd-coredump temp files. They could be lost on old filesystems, # for example, after hard reboot. x /var/lib/systemd/coredump/.#core*.%b* -r! /var/lib/systemd/coredump/.#* +r!$ /var/lib/systemd/coredump/.#* diff --git a/tmpfiles.d/systemd.conf.in b/tmpfiles.d/systemd.conf.in index 815fb2dd40..dac2e5bbc4 100644 --- a/tmpfiles.d/systemd.conf.in +++ b/tmpfiles.d/systemd.conf.in @@ -13,11 +13,11 @@ f+! /run/utmp 0664 root utmp - {% endif %} d /run/systemd/ask-password 0755 root root - -d /run/systemd/seats 0755 root root - -d /run/systemd/sessions 0755 root root - -d /run/systemd/users 0755 root root - +d$ /run/systemd/seats 0755 root root - +d$ /run/systemd/sessions 0755 root root - +d$ /run/systemd/users 0755 root root - d /run/systemd/machines 0755 root root - -d /run/systemd/shutdown 0755 root root - +d$ /run/systemd/shutdown 0755 root root - d /run/log 0755 root root -