summaryrefslogtreecommitdiff
path: root/src/login/logind.c
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2013-09-17 17:39:59 +0200
committerLennart Poettering <lennart@poettering.net>2013-09-17 13:47:19 -0500
commit92432fcc7f3a0320c07e99c5d395568a3aa216b6 (patch)
tree0e9ccd1b9571c54764d55991b9c10f7f51a80f13 /src/login/logind.c
parent3331234adc763378a5e48e7ad6dc2bf9657aa535 (diff)
logind: rename vtconsole to seat0
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!
Diffstat (limited to 'src/login/logind.c')
-rw-r--r--src/login/logind.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/login/logind.c b/src/login/logind.c
index c99c2844e..702382acf 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;