summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS7
-rw-r--r--tmpfiles.d/meson.build1
-rw-r--r--tmpfiles.d/systemd-network.conf13
-rw-r--r--tmpfiles.d/systemd.conf.in6
4 files changed, 21 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 10d650bd9f..74b699b086 100644
--- a/NEWS
+++ b/NEWS
@@ -71,6 +71,13 @@ CHANGES WITH 251:
(as exposed via the SystemCallFilter= setting in service unit files).
It is apparently used by the linker now.
+ * The tmpfiles entries that create the /run/systemd/netif directory and
+ its subdirectories were moved from tmpfiles.d/systemd.conf to
+ tmpfiles.d/systemd-network.conf.
+
+ Users might need to adjust their files that override tmpfiles.d/systemd.conf
+ to account for this change.
+
Changes in the Boot Loader Specification, kernel-install and sd-boot:
* kernel-install's and bootctl's Boot Loader Specification Type #1
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index 306e066f22..51f0f1099e 100644
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -13,6 +13,7 @@ files = [['README', ''],
['systemd-pstore.conf', 'ENABLE_PSTORE'],
['tmp.conf', ''],
['x11.conf', ''],
+ ['systemd-network.conf', 'ENABLE_NETWORKD'],
]
foreach pair : files
diff --git a/tmpfiles.d/systemd-network.conf b/tmpfiles.d/systemd-network.conf
new file mode 100644
index 0000000000..b30bc914a5
--- /dev/null
+++ b/tmpfiles.d/systemd-network.conf
@@ -0,0 +1,13 @@
+# 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
+
+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 -
diff --git a/tmpfiles.d/systemd.conf.in b/tmpfiles.d/systemd.conf.in
index 9b2357cd31..e23e102782 100644
--- a/tmpfiles.d/systemd.conf.in
+++ b/tmpfiles.d/systemd.conf.in
@@ -18,12 +18,6 @@ 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 -
-{% if ENABLE_NETWORKD %}
-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 -
-{% endif %}
d /run/log 0755 root root -