aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-19 03:04:11 +0100
committerBill Nottingham <notting@redhat.com>2010-11-21 23:00:48 -0500
commit3d74cc03f6a50a649d638bcd395b62b2e15a5c5a (patch)
treea4a249765cd4fe4b06ed226bb374ce27f0aa0469
parent86f9d6caae757d0306699fe59d4594f9f209d82c (diff)
downloadinitscripts-3d74cc03f6a50a649d638bcd395b62b2e15a5c5a.tar
initscripts-3d74cc03f6a50a649d638bcd395b62b2e15a5c5a.tar.gz
initscripts-3d74cc03f6a50a649d638bcd395b62b2e15a5c5a.tar.bz2
initscripts-3d74cc03f6a50a649d638bcd395b62b2e15a5c5a.tar.xz
initscripts-3d74cc03f6a50a649d638bcd395b62b2e15a5c5a.zip
systemd: simplify autorelabel ordering and add conditional suppression
-rw-r--r--systemd/system/fedora-autorelabel.service6
1 files changed, 4 insertions, 2 deletions
diff --git a/systemd/system/fedora-autorelabel.service b/systemd/system/fedora-autorelabel.service
index bca3f956..95877315 100644
--- a/systemd/system/fedora-autorelabel.service
+++ b/systemd/system/fedora-autorelabel.service
@@ -1,10 +1,12 @@
[Unit]
Description=Relabel all filesystems, if necessary
DefaultDependencies=no
+Requires=local-fs.target
Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
After=local-fs.target
-Requires=remount-rootfs.service local-fs.target
+Before=sysinit.target shutdown.target
+ConditionKernelCommandLine=autorelabel
+ConditionFileExists=/.autorelabel
[Service]
ExecStart=/lib/systemd/fedora-autorelabel