chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove src/run
[elogind.git]
/
src
/
timesync
/
timesyncd.c
diff --git
a/src/timesync/timesyncd.c
b/src/timesync/timesyncd.c
index b5a521f6725a28b979a2f80975fb72b138c9e56c..735668bedec960a64315676aa9df3f56248911e6 100644
(file)
--- a/
src/timesync/timesyncd.c
+++ b/
src/timesync/timesyncd.c
@@
-21,7
+21,6
@@
#include "sd-event.h"
#include "sd-daemon.h"
#include "sd-event.h"
#include "sd-daemon.h"
-#include "mkdir.h"
#include "capability.h"
#include "clock-util.h"
#include "network-util.h"
#include "capability.h"
#include "clock-util.h"
#include "network-util.h"
@@
-73,7
+72,7
@@
static int load_clock_timestamp(uid_t uid, gid_t gid) {
format_timestamp(date, sizeof(date), min));
if (clock_settime(CLOCK_REALTIME, timespec_store(&ts, min)) < 0)
format_timestamp(date, sizeof(date), min));
if (clock_settime(CLOCK_REALTIME, timespec_store(&ts, min)) < 0)
- log_error
(
"Failed to restore system clock: %m");
+ log_error
_errno(errno,
"Failed to restore system clock: %m");
}
return 0;
}
return 0;
@@
-101,7
+100,7
@@
int main(int argc, char *argv[]) {
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
- log_error_errno(
-
r, "Cannot resolve user name %s: %m", user);
+ log_error_errno(r, "Cannot resolve user name %s: %m", user);
goto finish;
}
goto finish;
}
@@
-113,11
+112,15
@@
int main(int argc, char *argv[]) {
if (r < 0)
goto finish;
if (r < 0)
goto finish;
+ /* We need one process for ourselves, plus one thread for the asynchronous resolver */
+ if (setrlimit(RLIMIT_NPROC, &RLIMIT_MAKE_CONST(2)) < 0)
+ log_warning_errno(errno, "Failed to lower RLIMIT_NPROC to 2: %m");
+
assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
r = manager_new(&m);
if (r < 0) {
assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
r = manager_new(&m);
if (r < 0) {
- log_error_errno(
-
r, "Failed to allocate manager: %m");
+ log_error_errno(r, "Failed to allocate manager: %m");
goto finish;
}
goto finish;
}
@@
-129,7
+132,7
@@
int main(int argc, char *argv[]) {
r = manager_parse_config_file(m);
if (r < 0)
r = manager_parse_config_file(m);
if (r < 0)
- log_warning_errno(
-
r, "Failed to parse configuration file: %m");
+ log_warning_errno(r, "Failed to parse configuration file: %m");
log_debug("systemd-timesyncd running as pid %lu", (unsigned long) getpid());
sd_notify(false,
log_debug("systemd-timesyncd running as pid %lu", (unsigned long) getpid());
sd_notify(false,
@@
-144,7
+147,7
@@
int main(int argc, char *argv[]) {
r = sd_event_loop(m->event);
if (r < 0) {
r = sd_event_loop(m->event);
if (r < 0) {
- log_error_errno(
-
r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
goto finish;
}