units: explicit Type=dbus is now redundant

[elogind.git] / units / systemd-binfmt.service.in

diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
index 0bf6df2011eacda499af0a4729b3c8d6a1cbd71a..8d288066dccbd028a0b2e3a21e1d677b3fd0517c 100644 (file)
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -1,8 +1,8 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
 [Unit]
@@ -11,7 +11,11 @@ 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
-ConditionDirectoryNotEmpty=/etc/binfmt.d
+ConditionPathIsReadWrite=/proc/sys/
+ConditionDirectoryNotEmpty=|/usr/lib/binfmt.d
+ConditionDirectoryNotEmpty=|/usr/local/lib/binfmt.d
+ConditionDirectoryNotEmpty=|/etc/binfmt.d
+ConditionDirectoryNotEmpty=|/run/binfmt.d
 
 [Service]
 Type=oneshot