chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: remove unneccesary Socket.got_socket_fd
[elogind.git]
/
src
/
core
/
main.c
diff --git
a/src/core/main.c
b/src/core/main.c
index 4d4f6e8f4caf664f772406840213b6f73326c8e8..6c3d9bfb189d071000d120e33e43338be01f1253 100644
(file)
--- a/
src/core/main.c
+++ b/
src/core/main.c
@@
-131,7
+131,7
@@
_noreturn_ static void crash(int sig) {
pid = fork();
if (pid < 0)
pid = fork();
if (pid < 0)
- log_error("Caught <%s>, cannot fork for core dump: %
s", signal_to_string(sig), strerror(errno
));
+ log_error("Caught <%s>, cannot fork for core dump: %
m", signal_to_string(sig
));
else if (pid == 0) {
struct rlimit rl = {};
else if (pid == 0) {
struct rlimit rl = {};
@@
-435,6
+435,7
@@
static int parse_proc_cmdline_word(const char *word) {
const char *filename, \
unsigned line, \
const char *section, \
const char *filename, \
unsigned line, \
const char *section, \
+ unsigned section_line, \
const char *lvalue, \
int ltype, \
const char *rvalue, \
const char *lvalue, \
int ltype, \
const char *rvalue, \
@@
-466,6
+467,7
@@
static int config_parse_cpu_affinity2(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-538,6
+540,7
@@
static int config_parse_join_controllers(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-1528,7
+1531,7
@@
int main(int argc, char *argv[]) {
if (arg_running_as == SYSTEMD_SYSTEM)
bump_rlimit_nofile(&saved_rlimit_nofile);
if (arg_running_as == SYSTEMD_SYSTEM)
bump_rlimit_nofile(&saved_rlimit_nofile);
- r = manager_new(arg_running_as,
!!serialization,
&m);
+ r = manager_new(arg_running_as, &m);
if (r < 0) {
log_error("Failed to allocate manager object: %s", strerror(-r));
goto finish;
if (r < 0) {
log_error("Failed to allocate manager object: %s", strerror(-r));
goto finish;
@@
-1742,7
+1745,7
@@
finish:
* initrd, but don't wait for them, so that we
* can handle the SIGCHLD for them after
* deserializing. */
* initrd, but don't wait for them, so that we
* can handle the SIGCHLD for them after
* deserializing. */
- broadcast_signal(SIGTERM, false);
+ broadcast_signal(SIGTERM, false
, true
);
/* And switch root */
r = switch_root(switch_root_dir);
/* And switch root */
r = switch_root(switch_root_dir);