summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-06-27 22:21:35 +0200
committerLennart Poettering <lennart@poettering.net>2012-06-27 22:23:16 +0200
commit5231084b479455e6cc892ec3c37c9f599c5bea58 (patch)
treea33e4bcc38a6a74890f67e7ffac66d617dea2cc0
parent27fda47f40453e552ebccf7acb85f915cf34f23a (diff)
units: add explicit dependency on display-manager.service to graphical.target
This replaces the symlink based dependency by an explicit one in the unit file so that we avoid the dangling symlink when no display manager is installed.
-rw-r--r--Makefile.am9
-rw-r--r--TODO7
-rw-r--r--man/bootup.xml24
-rw-r--r--units/graphical.target1
4 files changed, 15 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am
index 816a8eb4a4..b6b148ed50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3389,9 +3389,6 @@ if TARGET_FEDORA
rm -f display-manager.service single.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) rescue.service single.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_MANDRIVA
@@ -3400,9 +3397,6 @@ if TARGET_MANDRIVA
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service && \
$(LN_S) rescue.service single.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_DEBIAN_OR_UBUNTU
@@ -3422,9 +3416,6 @@ if TARGET_MAGEIA
rm -f display-manager.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
install-exec-hook: $(INSTALL_EXEC_HOOKS)
diff --git a/TODO b/TODO
index cfd7dd09da..c22f1f5579 100644
--- a/TODO
+++ b/TODO
@@ -25,6 +25,8 @@ Bugfixes:
Features:
+* systemctl list-unit-files appears to be broken for symlinked units in /usr/lib
+
* maybe allow services with ExecStop= set, but no ExecStart=?
* efi: implement /forcefsck as uefi variables thus not requiring file system altering to trigger a file system check
@@ -66,8 +68,6 @@ Features:
* readahead: when bumping /sys readahead variable save mtime and compare later to detect changes
-* Document boot options such as forcefsck
-
* (attempt to) make Debianites happy:
- implement .d/ auto includes for unit files
- add syntax to reset ExecStart= lists (and similar)
@@ -165,8 +165,6 @@ Features:
* support chrony in addition to ntpd in timedated
-* document crypttab(5)
-
* There's currently no way to cancel fsck (used to be possible via C-c or c on the console)
* journal: sanely deal with entries which are larger than the individual file size, but where the componets would fit
@@ -310,7 +308,6 @@ Features:
- resource control in systemd
- inhibiting
- testing with Harald's awesome test kit
- - the Documentation=
* allow port=0 in .socket units
diff --git a/man/bootup.xml b/man/bootup.xml
index e29c1a0167..ed72acfda9 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -147,18 +147,18 @@
v
basic.target
|
- _________________/| emergency.service
- / | |
- | | v
- v v <emphasis>emergency.target</emphasis>
- (various system (various system
- services services)
- required for |
- graphical UIs) v
- | <emphasis>multi-user.target</emphasis>
- | |
- | _________________/
- |/
+ __________________________________/| emergency.service
+ / | | |
+ | | | v
+ v v v <emphasis>emergency.target</emphasis>
+ display- (various system (various system
+ manager.service services services)
+ | required for |
+ | graphical UIs) v
+ | | <emphasis>multi-user.target</emphasis>
+ | | |
+ \_______________ | _________________/
+ \|/
v
<emphasis>graphical.target</emphasis></programlisting>
diff --git a/units/graphical.target b/units/graphical.target
index 7c6ebd4789..65f2521d9e 100644
--- a/units/graphical.target
+++ b/units/graphical.target
@@ -11,6 +11,7 @@ Documentation=man:systemd.special(7)
Requires=multi-user.target
After=multi-user.target
Conflicts=rescue.target
+Wants=display-manager.service
AllowIsolate=yes
[Install]