From 234be227ce1be7df36d8dd1595ac9fe47e6208f2 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 23 Aug 2015 11:59:34 +0200 Subject: 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. --- src/login/logind.c | 24 +----------------------- 1 file changed, 1 insertion(+), 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 #include +#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); -- cgit v1.2.3