summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-04-13 17:39:37 +0200
committerLennart Poettering <lennart@poettering.net>2012-04-13 18:52:53 +0200
commit41807efb1594ae8e71e0255e154ea7d17be2251a (patch)
tree533430e213dbda523778897daeb2e52f912a7235 /units
parent9f28b98ec6461b4e06edd1e149c1ee5e9dcc4be0 (diff)
units: do binfmt magic only when /proc/sys is writable
Diffstat (limited to 'units')
-rw-r--r--units/proc-sys-fs-binfmt_misc.automount3
-rw-r--r--units/systemd-binfmt.service.in1
2 files changed, 3 insertions, 1 deletions
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index 6edd1f55d3..658b55dc32 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -9,7 +9,8 @@
Description=Arbitrary Executable File Formats File System Automount Point
DefaultDependencies=no
Before=sysinit.target
-ConditionPathExists=/proc/sys/fs/binfmt_misc
+ConditionPathExists=/proc/sys/fs/binfmt_misc/
+ConditionPathIsReadWrite=/proc/sys/
[Automount]
Where=/proc/sys/fs/binfmt_misc
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
index 267d5c3fd8..8d288066dc 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -11,6 +11,7 @@ DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount
Before=sysinit.target shutdown.target
+ConditionPathIsReadWrite=/proc/sys/
ConditionDirectoryNotEmpty=|/usr/lib/binfmt.d
ConditionDirectoryNotEmpty=|/usr/local/lib/binfmt.d
ConditionDirectoryNotEmpty=|/etc/binfmt.d