aboutsummaryrefslogtreecommitdiffstats
path: root/systemd/system
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2011-04-04 09:56:57 +0200
committerBill Nottingham <notting@redhat.com>2011-04-04 11:33:11 -0400
commit93d8f7b7d63689e9244d1ce942997c0e32bdd7cb (patch)
tree7f3b77cc6c62dca7077f09509cc8a2c7c23f9fae /systemd/system
parentbbeaaf153d9feb059f658aab0c59a865856ff407 (diff)
downloadinitscripts-93d8f7b7d63689e9244d1ce942997c0e32bdd7cb.tar
initscripts-93d8f7b7d63689e9244d1ce942997c0e32bdd7cb.tar.gz
initscripts-93d8f7b7d63689e9244d1ce942997c0e32bdd7cb.tar.bz2
initscripts-93d8f7b7d63689e9244d1ce942997c0e32bdd7cb.tar.xz
initscripts-93d8f7b7d63689e9244d1ce942997c0e32bdd7cb.zip
let systemd check the conditions for fedora-autorelabel
The service unit file already checks whether /.autorelabel or the "autorelabel" parameter are present. No need to recheck in the script. Using the new "ConditionSecurity=" feature systemd can also check whether SELinux is enabled.
Diffstat (limited to 'systemd/system')
-rw-r--r--systemd/system/fedora-autorelabel.service1
1 files changed, 1 insertions, 0 deletions
diff --git a/systemd/system/fedora-autorelabel.service b/systemd/system/fedora-autorelabel.service
index cd6a84b3..c98a40ff 100644
--- a/systemd/system/fedora-autorelabel.service
+++ b/systemd/system/fedora-autorelabel.service
@@ -5,6 +5,7 @@ Requires=local-fs.target
Conflicts=shutdown.target
After=local-fs.target
Before=sysinit.target shutdown.target
+ConditionSecurity=selinux
ConditionKernelCommandLine=|autorelabel
ConditionPathExists=|/.autorelabel