summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2015-08-23 11:59:34 +0200
committerAndy Wingo <wingo@pobox.com>2015-08-23 11:59:34 +0200
commit234be227ce1be7df36d8dd1595ac9fe47e6208f2 (patch)
tree9cf14d0a3a34dff63156bb29fd6f27c577f5885c /src
parent08e1896fb7a00a758c3a71a99e54f0ff69da2fbd (diff)
logind.c cleanup
* src/login/logind.c: Remove unused vcsa dispatch function. Add mkdir_label header. Don't mkdir /run/systemd; we require that it be mounted over ramfs or tmpfs.
Diffstat (limited to 'src')
-rw-r--r--src/login/logind.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/src/login/logind.c b/src/login/logind.c
index 5856c336f6..e89dc59b4b 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -25,6 +25,7 @@
#include <string.h>
#include <unistd.h>
+#include "label.h"
#include "sd-daemon.h"
#include "strv.h"
#include "conf-parser.h"
@@ -491,28 +492,6 @@ static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t rev
return 0;
}
-static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
- _cleanup_udev_device_unref_ struct udev_device *d = NULL;
- Manager *m = userdata;
- const char *name;
-
- assert(m);
-
- d = udev_monitor_receive_device(m->udev_vcsa_monitor);
- if (!d)
- return -ENOMEM;
-
- name = udev_device_get_sysname(d);
-
- /* Whenever a VCSA device is removed try to reallocate our
- * VTs, to make sure our auto VTs never go away. */
-
- if (name && startswith(name, "vcsa") && streq_ptr(udev_device_get_action(d), "remove"))
- seat_preallocate_vts(m->seat0);
-
- return 0;
-}
-
static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
Manager *m = userdata;
@@ -1027,7 +1006,6 @@ int main(int argc, char *argv[]) {
* existence of /run/systemd/seats/ to determine whether
* logind is available, so please always make sure this check
* stays in. */
- mkdir_label("/run/systemd", 0755);
mkdir_label("/run/systemd/seats", 0755);
mkdir_label("/run/systemd/users", 0755);
mkdir_label("/run/systemd/sessions", 0755);