From 89032e9049921024fa65c292adb48bc8eba1e5a0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 11 Mar 2011 11:38:00 -0500 Subject: Fix conditions so that they operate as OR, not AND. (#684125) --- systemd/system/fedora-autorelabel.service | 4 ++-- systemd/system/fedora-loadmodules.service | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'systemd') diff --git a/systemd/system/fedora-autorelabel.service b/systemd/system/fedora-autorelabel.service index 10b37f69..cd6a84b3 100644 --- a/systemd/system/fedora-autorelabel.service +++ b/systemd/system/fedora-autorelabel.service @@ -5,8 +5,8 @@ Requires=local-fs.target Conflicts=shutdown.target After=local-fs.target Before=sysinit.target shutdown.target -ConditionKernelCommandLine=autorelabel -ConditionPathExists=/.autorelabel +ConditionKernelCommandLine=|autorelabel +ConditionPathExists=|/.autorelabel [Service] ExecStart=/lib/systemd/fedora-autorelabel diff --git a/systemd/system/fedora-loadmodules.service b/systemd/system/fedora-loadmodules.service index 9b801258..cd2b4910 100644 --- a/systemd/system/fedora-loadmodules.service +++ b/systemd/system/fedora-loadmodules.service @@ -4,8 +4,8 @@ DefaultDependencies=no Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service Before=sysinit.target shutdown.target -ConditionPathExists=/etc/rc.modules -ConditionDirectoryNotEmpty=/etc/sysconfig/modules/ +ConditionPathExists=|/etc/rc.modules +ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/ [Service] ExecStart=/lib/systemd/fedora-loadmodules -- cgit v1.2.1