chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: newer kernels return EINVAL if we invoke reboot() in a container lacking perms...
[elogind.git]
/
src
/
core
/
dbus-job.c
diff --git
a/src/core/dbus-job.c
b/src/core/dbus-job.c
index 4b20d495eb36e386881756d804f8a29171e9243c..1b01ead2da89d203d1b4dd867368561aeb5e64f3 100644
(file)
--- a/
src/core/dbus-job.c
+++ b/
src/core/dbus-job.c
@@
-100,7
+100,7
@@
static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusConnection *connec
if (!(reply = dbus_message_new_method_return(message)))
goto oom;
if (!(reply = dbus_message_new_method_return(message)))
goto oom;
- job_finish_and_invalidate(j, JOB_CANCELED);
+ job_finish_and_invalidate(j, JOB_CANCELED
, true
);
} else {
const BusBoundProperties bps[] = {
} else {
const BusBoundProperties bps[] = {
@@
-295,6
+295,7
@@
static DBusMessage* new_change_signal_message(Job *j) {
if (!dbus_message_append_args(m,
DBUS_TYPE_UINT32, &j->id,
DBUS_TYPE_OBJECT_PATH, &p,
if (!dbus_message_append_args(m,
DBUS_TYPE_UINT32, &j->id,
DBUS_TYPE_OBJECT_PATH, &p,
+ DBUS_TYPE_STRING, &j->unit->id,
DBUS_TYPE_INVALID))
goto oom;
}
DBUS_TYPE_INVALID))
goto oom;
}
@@
-326,6
+327,7
@@
static DBusMessage* new_removed_signal_message(Job *j) {
if (!dbus_message_append_args(m,
DBUS_TYPE_UINT32, &j->id,
DBUS_TYPE_OBJECT_PATH, &p,
if (!dbus_message_append_args(m,
DBUS_TYPE_UINT32, &j->id,
DBUS_TYPE_OBJECT_PATH, &p,
+ DBUS_TYPE_STRING, &j->unit->id,
DBUS_TYPE_STRING, &r,
DBUS_TYPE_INVALID))
goto oom;
DBUS_TYPE_STRING, &r,
DBUS_TYPE_INVALID))
goto oom;