chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copy: teach copy_bytes() btrfs reflink magic
[elogind.git]
/
src
/
login
/
logind-dbus.c
diff --git
a/src/login/logind-dbus.c
b/src/login/logind-dbus.c
index 0b2b7b5afeea56208587a7c07fddfb44ef4dd77d..8ea653f70d56c015a9f5f2d582c0dc499917d2ec 100644
(file)
--- a/
src/login/logind-dbus.c
+++ b/
src/login/logind-dbus.c
@@
-41,7
+41,7
@@
#include "bus-util.h"
#include "bus-error.h"
#include "logind.h"
#include "bus-util.h"
#include "bus-error.h"
#include "logind.h"
-#include "bus-errors.h"
+#include "bus-
common-
errors.h"
#include "udev-util.h"
static int property_get_idle_hint(
#include "udev-util.h"
static int property_get_idle_hint(
@@
-727,7
+727,7
@@
static int method_create_session(sd_bus *bus, sd_bus_message *message, void *use
/* Now, let's wait until the slice unit and stuff got
* created. We send the reply back from
/* Now, let's wait until the slice unit and stuff got
* created. We send the reply back from
- * session_send_create_reply().*/
+ * session_send_create_reply().
*/
return 1;
return 1;
@@
-1143,7
+1143,7
@@
static int attach_device(Manager *m, const char *seat, const char *sysfs) {
return -ENOMEM;
mkdir_p_label("/etc/udev/rules.d", 0755);
return -ENOMEM;
mkdir_p_label("/etc/udev/rules.d", 0755);
-
label
_init("/etc");
+
mac_selinux
_init("/etc");
r = write_string_file_atomic_label(file, rule);
if (r < 0)
return r;
r = write_string_file_atomic_label(file, rule);
if (r < 0)
return r;
@@
-1159,7
+1159,7
@@
static int flush_devices(Manager *m) {
d = opendir("/etc/udev/rules.d");
if (!d) {
if (errno != ENOENT)
d = opendir("/etc/udev/rules.d");
if (!d) {
if (errno != ENOENT)
- log_warning
(
"Failed to open /etc/udev/rules.d: %m");
+ log_warning
_errno(errno,
"Failed to open /etc/udev/rules.d: %m");
} else {
struct dirent *de;
} else {
struct dirent *de;
@@
-1175,7
+1175,7
@@
static int flush_devices(Manager *m) {
continue;
if (unlinkat(dirfd(d), de->d_name, 0) < 0)
continue;
if (unlinkat(dirfd(d), de->d_name, 0) < 0)
- log_warning
(
"Failed to unlink %s: %m", de->d_name);
+ log_warning
_errno(errno,
"Failed to unlink %s: %m", de->d_name);
}
}
}
}
@@
-1300,9
+1300,11
@@
static int bus_manager_log_shutdown(
q = NULL;
}
q = NULL;
}
- return log_struct(LOG_NOTICE, MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
+ return log_struct(LOG_NOTICE,
+ LOG_MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
p,
p,
- q, NULL);
+ q,
+ NULL);
}
static int lid_switch_ignore_handler(sd_event_source *e, uint64_t usec, void *userdata) {
}
static int lid_switch_ignore_handler(sd_event_source *e, uint64_t usec, void *userdata) {