service: fix units with more than one socket
https://bugzilla.redhat.com/show_bug.cgi?id=693289
This commit is contained in:
parent
82e23dddeb
commit
9c1b183c70
2
TODO
2
TODO
|
@ -21,8 +21,6 @@ F15:
|
||||||
|
|
||||||
* fix alsa mixer restore to not print error when no config is stored
|
* fix alsa mixer restore to not print error when no config is stored
|
||||||
|
|
||||||
* disable most systemctl verbs in chroot()s
|
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
|
|
||||||
* don't trim empty cgroups
|
* don't trim empty cgroups
|
||||||
|
|
|
@ -981,7 +981,7 @@ int exec_spawn(ExecCommand *command,
|
||||||
|
|
||||||
/* This string must fit in 10 chars (i.e. the length
|
/* This string must fit in 10 chars (i.e. the length
|
||||||
* of "/sbin/init") */
|
* of "/sbin/init") */
|
||||||
rename_process("sd:exec");
|
rename_process("sd.exec");
|
||||||
|
|
||||||
/* We reset exactly these signals, since they are the
|
/* We reset exactly these signals, since they are the
|
||||||
* only ones we set to SIG_IGN in the main daemon. All
|
* only ones we set to SIG_IGN in the main daemon. All
|
||||||
|
|
|
@ -1592,8 +1592,8 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(t, rfds, rn_fds);
|
memcpy(t, rfds, rn_fds * sizeof(int));
|
||||||
memcpy(t+rn_fds, cfds, cn_fds);
|
memcpy(t+rn_fds, cfds, cn_fds * sizeof(int));
|
||||||
free(rfds);
|
free(rfds);
|
||||||
free(cfds);
|
free(cfds);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue