chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: add a couple of Conflicts to make boot targets exclusive
[elogind.git]
/
units
/
basic.target.m4
diff --git
a/units/basic.target.m4
b/units/basic.target.m4
index 437e33d5e64cfadc42c0fc65d704caaabf592c1b..5053df41849d0ab51ab6af16ad24c48d14626ad1 100644
(file)
--- a/
units/basic.target.m4
+++ b/
units/basic.target.m4
@@
-21,8
+21,10
@@
Description=Basic System
Requires=local-fs.target swap.target sockets.target
After=local-fs.target swap.target sockets.target
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_ifdef(`TARGET_FEDORA',
-
#
Hook in Fedora's /etc/rc.d/rc.sysinit
+
m4_dnl
Hook in Fedora's /etc/rc.d/rc.sysinit
Requires=sysinit.service
Requires=sysinit.service
-After=sysinit.service)
+After=sysinit.service
+)m4_dnl