chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: move X11 socket
[elogind.git]
/
src
/
login
/
logind.c
diff --git
a/src/login/logind.c
b/src/login/logind.c
index 3a1903ca130032d946a02eba337f32d471109016..4aeac0cc2e28a7b6e88acdd828f4acb40e925a67 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-29,6
+29,8
@@
#include <sys/ioctl.h>
#include <linux/vt.h>
#include <sys/ioctl.h>
#include <linux/vt.h>
+#include <systemd/sd-daemon.h>
+
#include "logind.h"
#include "dbus-common.h"
#include "dbus-loop.h"
#include "logind.h"
#include "dbus-common.h"
#include "dbus-loop.h"
@@
-955,7
+957,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
+1077,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;
@@
-1223,9
+1226,20
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
+ log_debug("systemd-logind running as pid %lu", (unsigned long) getpid());
+
+ sd_notify(false,
+ "READY=1\n"
+ "STATUS=Processing requests...");
+
r = manager_run(m);
r = manager_run(m);
+ log_debug("systemd-logind stopped as pid %lu", (unsigned long) getpid());
+
finish:
finish:
+ sd_notify(false,
+ "STATUS=Shutting down...");
+
if (m)
manager_free(m);
if (m)
manager_free(m);