chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machine-id: initialize from $container_uuid if not set otherwise
[elogind.git]
/
src
/
update-utmp.c
diff --git
a/src/update-utmp.c
b/src/update-utmp.c
index 43495ccb897590e388f1a65d77788c482d9b819a..0d177d61645d56f7ebd37ff8e78349cf2818bd2b 100644
(file)
--- a/
src/update-utmp.c
+++ b/
src/update-utmp.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-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;
}
@@
-281,7
+284,7
@@
static int on_shutdown(Context *c) {
}
#endif
}
#endif
- if ((q = utmp_put_shutdown(
0
)) < 0) {
+ if ((q = utmp_put_shutdown()) < 0) {
log_error("Failed to write utmp record: %s", strerror(-q));
r = q;
}
log_error("Failed to write utmp record: %s", strerror(-q));
r = q;
}
@@
-336,7
+339,7
@@
static int on_runlevel(Context *c) {
}
#endif
}
#endif
- if ((q = utmp_put_runlevel(
0,
runlevel, previous)) < 0) {
+ if ((q = utmp_put_runlevel(runlevel, previous)) < 0) {
log_error("Failed to write utmp record: %s", strerror(-q));
r = q;
}
log_error("Failed to write utmp record: %s", strerror(-q));
r = q;
}
@@
-358,24
+361,30
@@
int main(int argc, char *argv[]) {
if (getppid() != 1) {
log_error("This program should be invoked by init only.");
if (getppid() != 1) {
log_error("This program should be invoked by init only.");
- return
1
;
+ return
EXIT_FAILURE
;
}
if (argc != 2) {
log_error("This program requires one argument.");
}
if (argc != 2) {
log_error("This program requires one argument.");
- return
1
;
+ return
EXIT_FAILURE
;
}
}
- log_set_target(LOG_TARGET_
SYSLOG_OR_KMSG
);
+ log_set_target(LOG_TARGET_
AUTO
);
log_parse_environment();
log_parse_environment();
+ log_open();
+
+ umask(0022);
#ifdef HAVE_AUDIT
#ifdef HAVE_AUDIT
- if ((c.audit_fd = audit_open()) < 0)
+ if ((c.audit_fd = audit_open()) < 0 &&
+ /* If the kernel lacks netlink or audit support,
+ * don't worry about it. */
+ errno != EAFNOSUPPORT && errno != EPROTONOSUPPORT)
log_error("Failed to connect to audit log: %m");
#endif
if (bus_connect(DBUS_BUS_SYSTEM, &c.bus, NULL, &error) < 0) {
log_error("Failed to connect to audit log: %m");
#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;
}
@@
-402,12
+411,13
@@
finish:
#endif
if (c.bus) {
#endif
if (c.bus) {
- dbus_connection_close(c.bus);
- dbus_connection_unref(c.bus);
+ dbus_connection_flush(c.bus);
+ dbus_connection_close(c.bus);
+ dbus_connection_unref(c.bus);
}
dbus_error_free(&error);
dbus_shutdown();
}
dbus_error_free(&error);
dbus_shutdown();
- return r < 0 ?
1 : 0
;
+ return r < 0 ?
EXIT_FAILURE : EXIT_SUCCESS
;
}
}