From 3d74cc03f6a50a649d638bcd395b62b2e15a5c5a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 19 Nov 2010 03:04:11 +0100
Subject: systemd: simplify autorelabel ordering and add conditional
 suppression

---
 systemd/system/fedora-autorelabel.service | 6 ++++--
 1 file 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
-- 
cgit v1.2.1