diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-05-14 02:29:45 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-05-14 02:29:45 +0200 |
commit | 4e85aff465b2ce0fa34222e52a6f5a984140b22e (patch) | |
tree | 6f33e8f35a0675b033755cebaea55817f6a753b2 /execute.c | |
parent | c0b52914d23f6cc65bb67c77e2c5e7d58a6e8b9a (diff) |
execute: fix bad jump
Diffstat (limited to 'execute.c')
-rw-r--r-- | execute.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1035,6 +1035,8 @@ int exec_spawn(ExecCommand *command, goto fail; } + assert(n_env <= 6); + if (!(final_env = strv_env_merge(environment, our_env, context->environment, NULL))) { r = EXIT_MEMORY; goto fail; @@ -1062,10 +1064,7 @@ int exec_spawn(ExecCommand *command, * sure that when we kill the cgroup the process will be * killed too). */ if (cgroup_bondings) - if ((r = cgroup_bonding_install_list(cgroup_bondings, pid)) < 0) { - r = EXIT_CGROUP; - goto fail; - } + cgroup_bonding_install_list(cgroup_bondings, pid); log_debug("Forked %s as %llu", command->path, (unsigned long long) pid); |