diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-10-20 19:36:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-20 19:36:28 +0200 |
| commit | 411e869f497c7c7bd0688f1e3500f9043bc56e48 (patch) | |
| tree | c2acc418f79df8593768775539e8771d17d361e5 /units/systemd-sysctl.service.in | |
| parent | units: extend stop timeout for user@.service to 120s (#4426) (diff) | |
| download | systemd-411e869f497c7c7bd0688f1e3500f9043bc56e48.tar.xz systemd-411e869f497c7c7bd0688f1e3500f9043bc56e48.zip | |
sysctl: run sysctl service if /proc/sys/net is writable (#4425)
This simply changes this line:
ConditionPathIsReadWrite=/proc/sys/
to this:
ConditionPathIsReadWrite=/proc/sys/net/
The background for this is that the latter is namespaced through network
namespacing usually and hence frequently set as writable in containers, even
though the former is kept read-only. If /proc/sys is read-only but
/proc/sys/net is writable we should run the sysctl service, as useful settings
may be made in this case.
Fixes: #4370
Diffstat (limited to '')
| -rw-r--r-- | units/systemd-sysctl.service.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in index d784c6426d..980f611df2 100644 --- a/units/systemd-sysctl.service.in +++ b/units/systemd-sysctl.service.in @@ -12,7 +12,7 @@ DefaultDependencies=no Conflicts=shutdown.target After=systemd-modules-load.service Before=sysinit.target shutdown.target -ConditionPathIsReadWrite=/proc/sys/ +ConditionPathIsReadWrite=/proc/sys/net/ [Service] Type=oneshot |