diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-04-13 17:39:37 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-04-13 18:52:53 +0200 |
| commit | 41807efb1594ae8e71e0255e154ea7d17be2251a (patch) | |
| tree | 533430e213dbda523778897daeb2e52f912a7235 /units | |
| parent | main: unset some more env vars (diff) | |
| download | systemd-41807efb1594ae8e71e0255e154ea7d17be2251a.tar.xz systemd-41807efb1594ae8e71e0255e154ea7d17be2251a.zip | |
units: do binfmt magic only when /proc/sys is writable
Diffstat (limited to 'units')
| -rw-r--r-- | units/proc-sys-fs-binfmt_misc.automount | 3 | ||||
| -rw-r--r-- | units/systemd-binfmt.service.in | 1 |
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 |