chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: simplify some dbus error messages a bit
[elogind.git]
/
src
/
update-utmp.c
diff --git
a/src/update-utmp.c
b/src/update-utmp.c
index b5d733ca441a60d50443a04e926699f70993a259..644b6df67cb831627b646f570359375d3b7539a3 100644
(file)
--- a/
src/update-utmp.c
+++ b/
src/update-utmp.c
@@
-77,7
+77,7
@@
static usec_t get_startup_time(Context *c) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
- log_error("Failed to send command: %s",
error.message
);
+ log_error("Failed to send command: %s",
bus_error_message(&error)
);
goto finish;
}
goto finish;
}
@@
-114,12
+114,15
@@
static int get_current_runlevel(Context *c) {
const char *special;
} table[] = {
/* The first target of this list that is active or has
const char *special;
} table[] = {
/* The first target of this list that is active or has
- * a job scheduled wins */
+ * a job scheduled wins. We prefer runlevels 5 and 3
+ * here over the others, since these are the main
+ * runlevels used on Fedora. It might make sense to
+ * change the order on some distributions. */
{ '5', SPECIAL_RUNLEVEL5_TARGET },
{ '5', SPECIAL_RUNLEVEL5_TARGET },
- { '4', SPECIAL_RUNLEVEL4_TARGET },
{ '3', SPECIAL_RUNLEVEL3_TARGET },
{ '3', SPECIAL_RUNLEVEL3_TARGET },
+ { '4', SPECIAL_RUNLEVEL4_TARGET },
{ '2', SPECIAL_RUNLEVEL2_TARGET },
{ '2', SPECIAL_RUNLEVEL2_TARGET },
- { '
1
', SPECIAL_RESCUE_TARGET },
+ { '
S
', SPECIAL_RESCUE_TARGET },
};
const char
*interface = "org.freedesktop.systemd1.Unit",
};
const char
*interface = "org.freedesktop.systemd1.Unit",
@@
-164,7
+167,7
@@
static int get_current_runlevel(Context *c) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
- log_error("Failed to parse reply: %s",
error.message
);
+ log_error("Failed to parse reply: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-191,7
+194,7
@@
static int get_current_runlevel(Context *c) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
- log_error("Failed to send command: %s",
error.message
);
+ log_error("Failed to send command: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-368,6
+371,7
@@
int main(int argc, char *argv[]) {
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_parse_environment();
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_parse_environment();
+ log_open();
#ifdef HAVE_AUDIT
if ((c.audit_fd = audit_open()) < 0)
#ifdef HAVE_AUDIT
if ((c.audit_fd = audit_open()) < 0)
@@
-375,7
+379,7
@@
int main(int argc, char *argv[]) {
#endif
if (bus_connect(DBUS_BUS_SYSTEM, &c.bus, NULL, &error) < 0) {
#endif
if (bus_connect(DBUS_BUS_SYSTEM, &c.bus, NULL, &error) < 0) {
- log_error("Failed to get D-Bus connection: %s",
error.message
);
+ log_error("Failed to get D-Bus connection: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}