From: Lennart Poettering Date: Mon, 17 May 2010 17:37:49 +0000 (+0200) Subject: units: add a couple of Conflicts to make boot targets exclusive X-Git-Tag: 0.git+20100605+dfd8ee-1~13^2~2^2~5 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50321ee3ef31b540e78bb767c3935763b96ea581;p=systemd units: add a couple of Conflicts to make boot targets exclusive --- diff --git a/units/basic.target.m4 b/units/basic.target.m4 index c31a8f68..5053df41 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 cb8e811a..aaed4a5b 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 b7f5f152..a49cfb9f 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