diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/login/logind-gperf.gperf | 1 | ||||
| -rw-r--r-- | src/login/logind.c | 48 | ||||
| -rw-r--r-- | src/login/logind.conf | 1 | ||||
| -rw-r--r-- | src/login/logind.h | 3 |
4 files changed, 47 insertions, 6 deletions
diff --git a/src/login/logind-gperf.gperf b/src/login/logind-gperf.gperf index 72fdad739b..f12718cf4e 100644 --- a/src/login/logind-gperf.gperf +++ b/src/login/logind-gperf.gperf @@ -15,6 +15,7 @@ struct ConfigPerfItem; %includes %% Login.NAutoVTs, config_parse_unsigned, 0, offsetof(Manager, n_autovts) +Login.ReserveVT, config_parse_unsigned, 0, offsetof(Manager, reserve_vt) Login.KillUserProcesses, config_parse_bool, 0, offsetof(Manager, kill_user_processes) Login.KillOnlyUsers, config_parse_strv, 0, offsetof(Manager, kill_only_users) Login.KillExcludeUsers, config_parse_strv, 0, offsetof(Manager, kill_exclude_users) diff --git a/src/login/logind.c b/src/login/logind.c index 229af714f8..f72eb490fe 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -50,8 +50,10 @@ Manager *manager_new(void) { m->udev_vcsa_fd = -1; m->udev_button_fd = -1; m->epoll_fd = -1; + m->reserve_vt_fd = -1; m->n_autovts = 6; + m->reserve_vt = 6; m->inhibit_delay_max = 5 * USEC_PER_SEC; m->handle_power_key = HANDLE_NO_SESSION; m->handle_sleep_key = HANDLE_TTY_SESSION; @@ -166,6 +168,9 @@ void manager_free(Manager *m) { if (m->epoll_fd >= 0) close_nointr_nofail(m->epoll_fd); + if (m->reserve_vt_fd >= 0) + close_nointr_nofail(m->reserve_vt_fd); + strv_free(m->controllers); strv_free(m->reset_controllers); strv_free(m->kill_only_users); @@ -948,20 +953,28 @@ int manager_spawn_autovt(Manager *m, int vtnr) { assert(m); assert(vtnr >= 1); - if ((unsigned) vtnr > m->n_autovts) + if ((unsigned) vtnr > m->n_autovts && + (unsigned) vtnr != m->reserve_vt) return 0; - r = vt_is_busy(vtnr); - if (r < 0) - return r; - else if (r > 0) - return -EBUSY; + if ((unsigned) vtnr != m->reserve_vt) { + /* If this is the reserved TTY, we'll start the getty + * on it in any case, but otherwise only if it is not + * busy. */ + + r = vt_is_busy(vtnr); + if (r < 0) + return r; + else if (r > 0) + return -EBUSY; + } if (asprintf(&name, "autovt@tty%i.service", vtnr) < 0) { log_error("Could not allocate service name."); r = -ENOMEM; goto finish; } + r = bus_method_call_with_reply ( m->bus, "org.freedesktop.systemd1", @@ -980,6 +993,26 @@ finish: return r; } +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) { + log_warning("Failed to pin reserved VT: %m"); + return -errno; + } + + return 0; +} + int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **session) { Session *s; char *p; @@ -1450,6 +1483,9 @@ 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); diff --git a/src/login/logind.conf b/src/login/logind.conf index 78496a0ef1..db5dde47a0 100644 --- a/src/login/logind.conf +++ b/src/login/logind.conf @@ -9,6 +9,7 @@ [Login] #NAutoVTs=6 +#ReserveVT=6 #KillUserProcesses=no #KillOnlyUsers= #KillExcludeUsers=root diff --git a/src/login/logind.h b/src/login/logind.h index 24d705b541..8aa28a322c 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -68,6 +68,9 @@ struct Manager { unsigned n_autovts; + unsigned reserve_vt; + int reserve_vt_fd; + Seat *vtconsole; char *cgroup_path; |