chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: don't recheck conditions when a unit is already starting but unit_start() is...
[elogind.git]
/
src
/
logind.c
diff --git
a/src/logind.c
b/src/logind.c
index ca48aa137fa4b9b75f03e1f7610c269f1007c0c6..1aad48d2dc0b4abca22053858388307796c41f1c 100644
(file)
--- a/
src/logind.c
+++ b/
src/logind.c
@@
-274,8
+274,7
@@
int manager_process_seat_device(Manager *m, struct udev_device *d) {
if (streq_ptr(udev_device_get_action(d), "remove")) {
if (streq_ptr(udev_device_get_action(d), "remove")) {
- /* FIXME: use syspath instead of sysname here, as soon as fb driver is fixed */
- device = hashmap_get(m->devices, udev_device_get_sysname(d));
+ device = hashmap_get(m->devices, udev_device_get_syspath(d));
if (!device)
return 0;
if (!device)
return 0;
@@
-295,7
+294,7
@@
int manager_process_seat_device(Manager *m, struct udev_device *d) {
return 0;
}
return 0;
}
- r = manager_add_device(m, udev_device_get_sys
name
(d), &device);
+ r = manager_add_device(m, udev_device_get_sys
path
(d), &device);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1193,14
+1192,14
@@
int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
log_parse_environment();
log_open();
+ umask(0022);
+
if (argc != 1) {
log_error("This program takes no arguments.");
r = -EINVAL;
goto finish;
}
if (argc != 1) {
log_error("This program takes no arguments.");
r = -EINVAL;
goto finish;
}
- umask(0022);
-
m = manager_new();
if (!m) {
log_error("Out of memory");
m = manager_new();
if (!m) {
log_error("Out of memory");