Skip to content

Commit

Permalink
sysusers,tmpfiles: re-create systemd-network, systemd-resolve and sys…
Browse files Browse the repository at this point in the history
…temd-timesync

This partially reverts d4e9e57,
0187368, and
4240cb0.
The services systemd-networkd, systemd-resolved, and systemd-timesyncd
enable DynamicUsers= and have bus interfaces. Unfortunately, these
has many problems now. Let us create the relevant users, at least,
tentatively.

Fixes #9503.
  • Loading branch information
yuwata authored and poettering committed Jul 16, 2018
1 parent 2667385 commit 5b5d826
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
9 changes: 9 additions & 0 deletions sysusers.d/systemd.conf.m4
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@
# (at your option) any later version.

g systemd-journal - -
m4_ifdef(`ENABLE_NETWORKD',
u systemd-network - "systemd Network Management"
)m4_dnl
m4_ifdef(`ENABLE_RESOLVE',
u systemd-resolve - "systemd Resolver"
)m4_dnl
m4_ifdef(`ENABLE_TIMESYNCD',
u systemd-timesync - "systemd Time Synchronization"
)m4_dnl
m4_ifdef(`ENABLE_COREDUMP',
u systemd-coredump - "systemd Core Dumper"
)m4_dnl
6 changes: 3 additions & 3 deletions tmpfiles.d/systemd.conf.m4
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ 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 - - -
d /run/systemd/netif/links 0755 - - -
d /run/systemd/netif/leases 0755 - - -
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 -
Expand Down

0 comments on commit 5b5d826

Please sign in to comment.