summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
Diffstat (limited to 'src/login')
-rw-r--r--src/login/logind-dbus.c8
-rw-r--r--src/login/logind-seat.c14
-rw-r--r--src/login/logind-seat.h2
-rw-r--r--src/login/logind-session.c2
-rw-r--r--src/login/logind.c8
-rw-r--r--src/login/logind.h2
6 files changed, 18 insertions, 18 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 113a2b73b6..4a23c93bd9 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -404,8 +404,8 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message) {
int v;
if (!seat)
- seat = m->vtconsole;
- else if (seat != m->vtconsole)
+ seat = m->seat0;
+ else if (seat != m->seat0)
return -EINVAL;
v = vtnr_from_tty(tty);
@@ -420,8 +420,8 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message) {
} 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)
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 2c60b8ae51..9b6ceb31af 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -105,11 +105,11 @@ int seat_save(Seat *s) {
fprintf(f,
"# This is private data. Do not parse.\n"
- "IS_VTCONSOLE=%i\n"
+ "IS_SEAT0=%i\n"
"CAN_MULTI_SESSION=%i\n"
"CAN_TTY=%i\n"
"CAN_GRAPHICAL=%i\n",
- seat_is_vtconsole(s),
+ seat_is_seat0(s),
seat_can_multi_session(s),
seat_can_tty(s),
seat_can_graphical(s));
@@ -424,16 +424,16 @@ int seat_attach_session(Seat *s, Session *session) {
return 0;
}
-bool seat_is_vtconsole(Seat *s) {
+bool seat_is_seat0(Seat *s) {
assert(s);
- return s->manager->vtconsole == s;
+ return s->manager->seat0 == s;
}
bool seat_can_multi_session(Seat *s) {
assert(s);
- if (!seat_is_vtconsole(s))
+ if (!seat_is_seat0(s))
return false;
/* If we can't watch which VT is in the foreground, we don't
@@ -445,7 +445,7 @@ bool seat_can_multi_session(Seat *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) {
@@ -503,7 +503,7 @@ int seat_check_gc(Seat *s, bool drop_not_started) {
if (drop_not_started && !s->started)
return 0;
- if (seat_is_vtconsole(s))
+ if (seat_is_seat0(s))
return 1;
return seat_has_master_device(s);
diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h
index bd5390f553..47fe89a690 100644
--- a/src/login/logind-seat.h
+++ b/src/login/logind-seat.h
@@ -60,7 +60,7 @@ int seat_preallocate_vts(Seat *s);
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);
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index fa8b5157e8..407429c48a 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -372,7 +372,7 @@ int session_activate(Session *s) {
if (s->seat->active == s)
return 0;
- assert(seat_is_vtconsole(s->seat));
+ assert(seat_is_seat0(s->seat));
return chvt(s->vtnr);
}
diff --git a/src/login/logind.c b/src/login/logind.c
index c99c2844e8..702382acff 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -858,7 +858,7 @@ int manager_dispatch_vcsa_udev(Manager *m) {
* 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);
udev_device_unref(d);
@@ -883,9 +883,9 @@ int manager_dispatch_button_udev(Manager *m) {
int manager_dispatch_console(Manager *m) {
assert(m);
+ assert(m->seat0);
- if (m->vtconsole)
- seat_read_active_vt(m->vtconsole);
+ seat_read_active_vt(m->seat0);
return 0;
}
@@ -1543,7 +1543,7 @@ int manager_startup(Manager *m) {
return r;
/* Instantiate magic seat 0 */
- r = manager_add_seat(m, "seat0", &m->vtconsole);
+ r = manager_add_seat(m, "seat0", &m->seat0);
if (r < 0)
return r;
diff --git a/src/login/logind.h b/src/login/logind.h
index a76936da17..9e6296cb7e 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -74,7 +74,7 @@ struct Manager {
unsigned reserve_vt;
int reserve_vt_fd;
- Seat *vtconsole;
+ Seat *seat0;
char **kill_only_users, **kill_exclude_users;
bool kill_user_processes;