]> err.no Git - systemd/commitdiff
units: add a couple of Conflicts to make boot targets exclusive
authorLennart Poettering <lennart@poettering.net>
Mon, 17 May 2010 17:37:49 +0000 (19:37 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 17 May 2010 17:37:49 +0000 (19:37 +0200)
units/basic.target.m4
units/graphical.target.m4
units/multi-user.target.m4

index c31a8f681ef262760de01d2995e48c6a8b043f9c..5053df41849d0ab51ab6af16ad24c48d14626ad1 100644 (file)
@@ -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
index cb8e811a8b4fd09a4f48118f9140667ba531854b..aaed4a5b7ba27419d1a7efe9726bbd28ec7ceb75 100644 (file)
@@ -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
index b7f5f152ac8ea467ef3334efa3c023cd26c9aaf7..a49cfb9f555db22e4c83b52384558f4823b236fd 100644 (file)
@@ -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