chiark / gitweb /
units: add explicit dependency on display-manager.service to graphical.target
authorLennart Poettering <lennart@poettering.net>
Wed, 27 Jun 2012 20:21:35 +0000 (22:21 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 27 Jun 2012 20:23:16 +0000 (22:23 +0200)
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.

Makefile.am
TODO
man/bootup.xml
units/graphical.target

index 816a8eb..b6b148e 100644 (file)
@@ -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 cfd7dd0..c22f1f5 100644 (file)
--- 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
 
index e29c1a0..ed72acf 100644 (file)
                                                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>
 
index 7c6ebd4..65f2521 100644 (file)
@@ -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]