summaryrefslogtreecommitdiff
path: root/tmpfiles.d
diff options
context:
space:
mode:
authorŁukasz Stelmach <l.stelmach@samsung.com>2014-11-28 15:59:59 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-30 23:50:19 -0500
commit5a16bc264c32237e38a844d55e7a1820a31b8440 (patch)
tree0f259cac8dcc873dff16ea25f8c6e9f7b7dc6889 /tmpfiles.d
parentf4e9cdbc6259237b2cb779a16e7c1aca0fd44e58 (diff)
build-sys: configure the list of system users, files and directories
Choose which system users defined in sysusers.d/systemd.conf and files or directories in tmpfiles.d/systemd.conf, should be provided depending on comile-time configuration.
Diffstat (limited to 'tmpfiles.d')
-rw-r--r--tmpfiles.d/.gitignore3
-rw-r--r--tmpfiles.d/systemd.conf.m4 (renamed from tmpfiles.d/systemd.conf)2
2 files changed, 4 insertions, 1 deletions
diff --git a/tmpfiles.d/.gitignore b/tmpfiles.d/.gitignore
index eb323154ff..4f0ecaa9c3 100644
--- a/tmpfiles.d/.gitignore
+++ b/tmpfiles.d/.gitignore
@@ -1 +1,2 @@
-etc.conf
+/etc.conf
+/systemd.conf
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf.m4
index 9ca5ad2bc8..ad05f43334 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf.m4
@@ -16,9 +16,11 @@ 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 -
+m4_ifdef(`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 -
+)m4_dnl
d /run/log 0755 root root -