chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vconsole: don't parse Fedora's KEYMAP= kernel parameters anymore
[elogind.git]
/
src
/
execute.c
diff --git
a/src/execute.c
b/src/execute.c
index c73b0c6c04866704d3af9f750ea5143669daebfa..53e7e77fdec0536bee1188940f88f322f9f22237 100644
(file)
--- a/
src/execute.c
+++ b/
src/execute.c
@@
-188,9
+188,9
@@
static int connect_logger_as(const ExecContext *context, ExecOutput output, cons
zero(sa);
sa.sa.sa_family = AF_UNIX;
zero(sa);
sa.sa.sa_family = AF_UNIX;
- strncpy(sa.un.sun_path,
LOGGER
_SOCKET, sizeof(sa.un.sun_path));
+ strncpy(sa.un.sun_path,
STDOUT_SYSLOG_BRIDGE
_SOCKET, sizeof(sa.un.sun_path));
- if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + sizeof(
LOGGER
_SOCKET) - 1) < 0) {
+ if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + sizeof(
STDOUT_SYSLOG_BRIDGE
_SOCKET) - 1) < 0) {
close_nointr_nofail(fd);
return -errno;
}
close_nointr_nofail(fd);
return -errno;
}
@@
-930,6
+930,7
@@
int exec_spawn(ExecCommand *command,
bool apply_tty_stdin,
bool confirm_spawn,
CGroupBonding *cgroup_bondings,
bool apply_tty_stdin,
bool confirm_spawn,
CGroupBonding *cgroup_bondings,
+ CGroupAttribute *cgroup_attributes,
pid_t *ret) {
pid_t pid;
pid_t *ret) {
pid_t pid;
@@
-973,9
+974,11
@@
int exec_spawn(ExecCommand *command,
log_debug("About to execute: %s", line);
free(line);
log_debug("About to execute: %s", line);
free(line);
- if (cgroup_bondings)
- if ((r = cgroup_bonding_realize_list(cgroup_bondings)))
- goto fail_parent;
+ r = cgroup_bonding_realize_list(cgroup_bondings);
+ if (r < 0)
+ goto fail_parent;
+
+ cgroup_attribute_apply_list(cgroup_attributes, cgroup_bondings);
if ((pid = fork()) < 0) {
r = -errno;
if ((pid = fork()) < 0) {
r = -errno;