The seat->vtconsole member always points to the default seat seat0. Even
if VTs are disabled, it's used as default seat. Therefore, rename it to
seat0 to correctly state what it is.
This also changes the seat files in /run from IS_VTCONSOLE to IS_SEAT0. It
wasn't used by any code, yet, so this seems fine.
While we are at it, we also remove every "if (s->vtconsole)" as this
pointer is always valid!
- seat = m->vtconsole;
- else if (seat != m->vtconsole)
+ seat = m->seat0;
+ else if (seat != m->seat0)
return -EINVAL;
v = vtnr_from_tty(tty);
return -EINVAL;
v = vtnr_from_tty(tty);
} else if (tty_is_console(tty)) {
if (!seat)
} else if (tty_is_console(tty)) {
if (!seat)
- seat = m->vtconsole;
- else if (seat != m->vtconsole)
+ seat = m->seat0;
+ else if (seat != m->seat0)
return -EINVAL;
if (vtnr != 0)
return -EINVAL;
if (vtnr != 0)
fprintf(f,
"# This is private data. Do not parse.\n"
fprintf(f,
"# This is private data. Do not parse.\n"
"CAN_MULTI_SESSION=%i\n"
"CAN_TTY=%i\n"
"CAN_GRAPHICAL=%i\n",
"CAN_MULTI_SESSION=%i\n"
"CAN_TTY=%i\n"
"CAN_GRAPHICAL=%i\n",
seat_can_multi_session(s),
seat_can_tty(s),
seat_can_graphical(s));
seat_can_multi_session(s),
seat_can_tty(s),
seat_can_graphical(s));
-bool seat_is_vtconsole(Seat *s) {
+bool seat_is_seat0(Seat *s) {
- return s->manager->vtconsole == s;
+ return s->manager->seat0 == s;
}
bool seat_can_multi_session(Seat *s) {
assert(s);
}
bool seat_can_multi_session(Seat *s) {
assert(s);
- if (!seat_is_vtconsole(s))
return false;
/* If we can't watch which VT is in the foreground, we don't
return false;
/* If we can't watch which VT is in the foreground, we don't
bool seat_can_tty(Seat *s) {
assert(s);
bool seat_can_tty(Seat *s) {
assert(s);
- return seat_is_vtconsole(s);
+ return seat_is_seat0(s);
}
bool seat_has_master_device(Seat *s) {
}
bool seat_has_master_device(Seat *s) {
if (drop_not_started && !s->started)
return 0;
if (drop_not_started && !s->started)
return 0;
- if (seat_is_vtconsole(s))
return 1;
return seat_has_master_device(s);
return 1;
return seat_has_master_device(s);
int seat_attach_session(Seat *s, Session *session);
int seat_attach_session(Seat *s, Session *session);
-bool seat_is_vtconsole(Seat *s);
+bool seat_is_seat0(Seat *s);
bool seat_can_multi_session(Seat *s);
bool seat_can_tty(Seat *s);
bool seat_has_master_device(Seat *s);
bool seat_can_multi_session(Seat *s);
bool seat_can_tty(Seat *s);
bool seat_has_master_device(Seat *s);
if (s->seat->active == s)
return 0;
if (s->seat->active == s)
return 0;
- assert(seat_is_vtconsole(s->seat));
+ assert(seat_is_seat0(s->seat));
* VTs, to make sure our auto VTs never go away. */
if (name && startswith(name, "vcsa") && streq_ptr(udev_device_get_action(d), "remove"))
* VTs, to make sure our auto VTs never go away. */
if (name && startswith(name, "vcsa") && streq_ptr(udev_device_get_action(d), "remove"))
- r = seat_preallocate_vts(m->vtconsole);
+ r = seat_preallocate_vts(m->seat0);
int manager_dispatch_console(Manager *m) {
assert(m);
int manager_dispatch_console(Manager *m) {
assert(m);
- if (m->vtconsole)
- seat_read_active_vt(m->vtconsole);
+ seat_read_active_vt(m->seat0);
return r;
/* Instantiate magic seat 0 */
return r;
/* Instantiate magic seat 0 */
- r = manager_add_seat(m, "seat0", &m->vtconsole);
+ r = manager_add_seat(m, "seat0", &m->seat0);
unsigned reserve_vt;
int reserve_vt_fd;
unsigned reserve_vt;
int reserve_vt_fd;
char **kill_only_users, **kill_exclude_users;
bool kill_user_processes;
char **kill_only_users, **kill_exclude_users;
bool kill_user_processes;