summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-05-17 19:37:49 +0200
committerLennart Poettering <lennart@poettering.net>2010-05-17 19:37:49 +0200
commit50321ee3ef31b540e78bb767c3935763b96ea581 (patch)
tree7f30cd85437a0a24a199202ee83ca2f68a1da4a1
parentbd3d19a4ea3b007bea4c94213cafd5dc37ce7a3d (diff)
units: add a couple of Conflicts to make boot targets exclusive
-rw-r--r--units/basic.target.m41
-rw-r--r--units/graphical.target.m41
-rw-r--r--units/multi-user.target.m41
3 files changed, 3 insertions, 0 deletions
diff --git a/units/basic.target.m4 b/units/basic.target.m4
index c31a8f681e..5053df4184 100644
--- a/units/basic.target.m4
+++ b/units/basic.target.m4
@@ -21,6 +21,7 @@
Description=Basic System
Requires=local-fs.target swap.target sockets.target
After=local-fs.target swap.target sockets.target
+Conflicts=emergency.service
m4_dnl
m4_ifdef(`TARGET_FEDORA',
m4_dnl Hook in Fedora's /etc/rc.d/rc.sysinit
diff --git a/units/graphical.target.m4 b/units/graphical.target.m4
index cb8e811a8b..aaed4a5b7b 100644
--- a/units/graphical.target.m4
+++ b/units/graphical.target.m4
@@ -21,6 +21,7 @@
Description=Graphical Interface
Requires=multi-user.target
After=multi-user.target
+Conflicts=rescue.target
m4_dnl
m4_ifdef(`TARGET_FEDORA',
m4_dnl On Fedora Runlevel 5 is graphical login
diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
index b7f5f152ac..a49cfb9f55 100644
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -21,6 +21,7 @@
Description=Multi-User
Requires=basic.target
After=basic.target
+Conflicts=rescue.target
m4_dnl
m4_ifdef(`TARGET_FEDORA',
m4_dnl On Fedora Runlevel 3 is multi-user