chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: wording and grammar updates
[elogind.git]
/
src
/
update-utmp
/
update-utmp.c
diff --git
a/src/update-utmp/update-utmp.c
b/src/update-utmp/update-utmp.c
index fceeed8b446873281b87080a7a70a9a3ec89c95c..202aa987675b459b1b960b17f0e666c6f591ca4f 100644
(file)
--- a/
src/update-utmp/update-utmp.c
+++ b/
src/update-utmp/update-utmp.c
@@
-48,7
+48,7
@@
typedef struct Context {
static usec_t get_startup_time(Context *c) {
const char
*interface = "org.freedesktop.systemd1.Manager",
static usec_t get_startup_time(Context *c) {
const char
*interface = "org.freedesktop.systemd1.Manager",
- *property = "
Startup
Timestamp";
+ *property = "
Userspace
Timestamp";
usec_t t = 0;
DBusMessage *reply = NULL;
usec_t t = 0;
DBusMessage *reply = NULL;
@@
-104,7
+104,7
@@
static int get_current_runlevel(Context *c) {
{ '3', SPECIAL_RUNLEVEL3_TARGET },
{ '4', SPECIAL_RUNLEVEL4_TARGET },
{ '2', SPECIAL_RUNLEVEL2_TARGET },
{ '3', SPECIAL_RUNLEVEL3_TARGET },
{ '4', SPECIAL_RUNLEVEL4_TARGET },
{ '2', SPECIAL_RUNLEVEL2_TARGET },
- { '
S
', SPECIAL_RESCUE_TARGET },
+ { '
1
', SPECIAL_RESCUE_TARGET },
};
const char
*interface = "org.freedesktop.systemd1.Unit",
};
const char
*interface = "org.freedesktop.systemd1.Unit",
@@
-301,8
+301,10
@@
static int on_runlevel(Context *c) {
#endif
if ((q = utmp_put_runlevel(runlevel, previous)) < 0) {
#endif
if ((q = utmp_put_runlevel(runlevel, previous)) < 0) {
- log_error("Failed to write utmp record: %s", strerror(-q));
- r = q;
+ if (q != -ESRCH && q != -ENOENT) {
+ log_error("Failed to write utmp record: %s", strerror(-q));
+ r = q;
+ }
}
return r;
}
return r;
@@
-311,11
+313,10
@@
static int on_runlevel(Context *c) {
int main(int argc, char *argv[]) {
int r;
DBusError error;
int main(int argc, char *argv[]) {
int r;
DBusError error;
- Context c;
+ Context c
= {}
;
dbus_error_init(&error);
dbus_error_init(&error);
- zero(c);
#ifdef HAVE_AUDIT
c.audit_fd = -1;
#endif
#ifdef HAVE_AUDIT
c.audit_fd = -1;
#endif