consolidate TODO

2 files changed, 6 insertions, 16 deletions

diff --git a/TODO b/TODO
index 0d6ac4130c..fa90ae7dc5 100644
--- a/TODO
+++ b/TODO
@@ -24,15 +24,17 @@ Features:
 
 * logind: implement shutdown service
 
+* logind: non-local X11 server handling
+
+* logind: use sysfs path in device hash table instead of syname, as soon as fb driver is fixed
+
+* logind: add direct client API
+
 * possibly apply systemd-sysctl per network device subtrees on hotplug
 
 * implement Register= switch in .socket units to enable registration
   in Avahi, RPC and other socket registration services.
 
-* Remove kill_mode parameter to kill bus calls
-
-* Fix nspawn to not read-only mount /selinux on the host system
-
 * make sure people don't leave processes around after ExecStartPre=
 
 * make sure systemd-ask-password-wall does not shutdown systemd-ask-password-console too early
diff --git a/src/logind.h b/src/logind.h
index 1f5f9fe4a6..5a48756982 100644
--- a/src/logind.h
+++ b/src/logind.h
@@ -32,18 +32,6 @@
 #include "hashmap.h"
 #include "cgroup-util.h"
 
-/* TODO:
- *
- * spawn user systemd
- * direct client API
- *
- * udev:
- * use sysfs in device hash table, not sysname, when fb driver is fixed
- *
- * non-local X11 server
- * reboot/shutdown halt management
- */
-
 typedef struct Manager Manager;
 
 #include "logind-device.h"