aboutsummaryrefslogtreecommitdiffstats
path: root/systemd/system
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-03-11 11:38:00 -0500
committerBill Nottingham <notting@redhat.com>2011-03-11 11:38:00 -0500
commit89032e9049921024fa65c292adb48bc8eba1e5a0 (patch)
tree1920ae88825ea0269352744c4a8dd1c55b1a98e4 /systemd/system
parentf1230e6e355d41bcc82f117d94b5fd87b32edea4 (diff)
downloadinitscripts-89032e9049921024fa65c292adb48bc8eba1e5a0.tar
initscripts-89032e9049921024fa65c292adb48bc8eba1e5a0.tar.gz
initscripts-89032e9049921024fa65c292adb48bc8eba1e5a0.tar.bz2
initscripts-89032e9049921024fa65c292adb48bc8eba1e5a0.tar.xz
initscripts-89032e9049921024fa65c292adb48bc8eba1e5a0.zip
Fix conditions so that they operate as OR, not AND. (#684125)
Diffstat (limited to 'systemd/system')
-rw-r--r--systemd/system/fedora-autorelabel.service4
-rw-r--r--systemd/system/fedora-loadmodules.service4
2 files changed, 4 insertions, 4 deletions
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