diff options
author | Andy Wingo <wingo@pobox.com> | 2015-08-23 11:17:14 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2015-08-23 11:17:14 +0200 |
commit | 16e56d9f1ae28f17cf360a6daaab668b6cd66e61 (patch) | |
tree | 7aa08ddb30fcf6ff31ddc2bdb8a5bf612a76fbca /src/login/logind.c | |
parent | b1d35da9e405abaab2ff540baf2e54087f92e881 (diff) |
Remove support for auto-spawning VTs
Auto-spawning VTs requires systemd in practice. If you're using systemd
you can just use its logind :)
Diffstat (limited to 'src/login/logind.c')
-rw-r--r-- | src/login/logind.c | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/src/login/logind.c b/src/login/logind.c index 9f1b5e3fde..845a229230 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -42,10 +42,7 @@ Manager *manager_new(void) { return NULL; m->console_active_fd = -1; - m->reserve_vt_fd = -1; - m->n_autovts = 6; - m->reserve_vt = 6; m->remove_ipc = true; m->inhibit_delay_max = 5 * USEC_PER_SEC; m->handle_power_key = HANDLE_POWEROFF; @@ -167,8 +164,6 @@ void manager_free(Manager *m) { sd_bus_unref(m->bus); sd_event_unref(m->event); - safe_close(m->reserve_vt_fd); - strv_free(m->kill_only_users); strv_free(m->kill_exclude_users); @@ -550,29 +545,6 @@ static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents return 0; } -static int manager_reserve_vt(Manager *m) { - _cleanup_free_ char *p = NULL; - - assert(m); - - if (m->reserve_vt <= 0) - return 0; - - if (asprintf(&p, "/dev/tty%u", m->reserve_vt) < 0) - return log_oom(); - - m->reserve_vt_fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK); - if (m->reserve_vt_fd < 0) { - - /* Don't complain on VT-less systems */ - if (errno != ENOENT) - log_warning_errno(errno, "Failed to pin reserved VT: %m"); - return -errno; - } - - return 0; -} - static int manager_connect_bus(Manager *m) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int r; @@ -865,26 +837,6 @@ static int manager_connect_udev(Manager *m) { return r; } - /* Don't bother watching VCSA devices, if nobody cares */ - if (m->n_autovts > 0 && m->console_active_fd >= 0) { - - m->udev_vcsa_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); - if (!m->udev_vcsa_monitor) - return -ENOMEM; - - r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_vcsa_monitor, "vc", NULL); - if (r < 0) - return r; - - r = udev_monitor_enable_receiving(m->udev_vcsa_monitor); - if (r < 0) - return r; - - r = sd_event_add_io(m->event, &m->udev_vcsa_event_source, udev_monitor_get_fd(m->udev_vcsa_monitor), EPOLLIN, manager_dispatch_vcsa_udev, m); - if (r < 0) - return r; - } - return 0; } @@ -1062,9 +1014,6 @@ int manager_startup(Manager *m) { /* Remove stale objects before we start them */ manager_gc(m, false); - /* Reserve the special reserved VT */ - manager_reserve_vt(m); - /* And start everything */ HASHMAP_FOREACH(seat, m->seats, i) seat_start(seat); |