diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-04-27 10:25:22 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-05-03 20:46:14 +0200 |
| commit | eb1446f8f155e2253c9cc7068b29dcdbb6d68aa6 (patch) | |
| tree | 6cfdfee48fa7b5a42d4260357a8f242fff007413 /tmpfiles.d | |
| parent | bdb2d3c6889408c7f26c2eeddbe9021ac53f962c (diff) | |
| download | systemd-eb1446f8f155e2253c9cc7068b29dcdbb6d68aa6.tar.gz | |
tmpfiles: Split networkd entries into a separate file
Many distributions ship systemd-networkd as a separate file so we
need to be able to ship the tmpfiles networkd entries as part of
that separate networkd package. Let's split the networkd entries
into a separate file to make that possible.
Diffstat (limited to 'tmpfiles.d')
| -rw-r--r-- | tmpfiles.d/meson.build | 1 | ||||
| -rw-r--r-- | tmpfiles.d/systemd-network.conf | 13 | ||||
| -rw-r--r-- | tmpfiles.d/systemd.conf.in | 6 |
3 files changed, 14 insertions, 6 deletions
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 - |