chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
addedec
)
logind: don't watch vcsa if nobody cares
author
Lennart Poettering
<lennart@poettering.net>
Tue, 3 Jan 2012 20:50:02 +0000
(21:50 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 3 Jan 2012 20:50:02 +0000
(21:50 +0100)
src/login/logind.c
patch
|
blob
|
history
diff --git
a/src/login/logind.c
b/src/login/logind.c
index 3a1903ca130032d946a02eba337f32d471109016..333d5f85bdd09c808c310bc7d513a2c3cd864f58 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-955,7
+955,8
@@
static int manager_connect_udev(Manager *m) {
ev.events = EPOLLIN;
ev.data.u32 = FD_SEAT_UDEV;
ev.events = EPOLLIN;
ev.data.u32 = FD_SEAT_UDEV;
- if (m->n_autovts <= 0)
+ /* Don't bother watching VCSA devices, if nobody cares */
+ if (m->n_autovts <= 0 || m->console_active_fd < 0)
return 0;
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_seat_fd, &ev) < 0)
return 0;
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_seat_fd, &ev) < 0)
@@
-1074,13
+1075,13
@@
int manager_startup(Manager *m) {
if (m->epoll_fd < 0)
return -errno;
if (m->epoll_fd < 0)
return -errno;
- /* Connect to
udev
*/
- r = manager_connect_
udev
(m);
+ /* Connect to
console
*/
+ r = manager_connect_
console
(m);
if (r < 0)
return r;
if (r < 0)
return r;
- /* Connect to
console
*/
- r = manager_connect_
console
(m);
+ /* Connect to
udev
*/
+ r = manager_connect_
udev
(m);
if (r < 0)
return r;
if (r < 0)
return r;