test-network: rename l2tp_tunnel_remove -> remove_l2tp_tunnels

[thirdparty/systemd.git] / tmpfiles.d / etc.conf.m4

diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
index f567c8d6ea45eefc589fb7357ce98b98d53f5a12..df8d42101ca51a419be8b9556daa6b9384d98011 100644 (file)
--- a/tmpfiles.d/etc.conf.m4
+++ b/tmpfiles.d/etc.conf.m4
@@ -10,8 +10,13 @@
 L /etc/os-release - - - - ../usr/lib/os-release
 L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
 L+ /etc/mtab - - - - ../proc/self/mounts
-m4_ifdef(`ENABLE_RESOLVED',
-L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
-)
+m4_ifdef(`HAVE_SMACK_RUN_LABEL',
+t /etc/mtab - - - - security.SMACK64=_
+)m4_dnl
+m4_ifdef(`ENABLE_RESOLVE',
+L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
+)m4_dnl
 C /etc/nsswitch.conf - - - -
+m4_ifdef(`HAVE_PAM',
 C /etc/pam.d - - - -
+)m4_dnl