diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-21 21:20:33 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-21 21:20:33 +0100 |
| commit | ce57d1299f6dadecb36c597e35c00de79d00c5f4 (patch) | |
| tree | 0a900704b79558b4f1683debc9b36fd62b2f2c5b /lib/Utils/spawn.cpp | |
| parent | f750288769b23497ad5b57b1c50f683402c509f6 (diff) | |
| parent | 4b54f9866f0dbdc859e300b0169b6ef504ee6c12 (diff) | |
Merge branch 'master' into rhel6
Conflicts:
src/Daemon/abrt.conf
Diffstat (limited to 'lib/Utils/spawn.cpp')
| -rw-r--r-- | lib/Utils/spawn.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Utils/spawn.cpp b/lib/Utils/spawn.cpp index 43c4b4a..54d08a4 100644 --- a/lib/Utils/spawn.cpp +++ b/lib/Utils/spawn.cpp @@ -115,7 +115,7 @@ char *run_in_shell_and_save_output(int flags, flags |= EXECFLG_OUTPUT; flags &= ~EXECFLG_INPUT; - const char *argv[] = { "/bin/sh", "sh", "-c", cmd, NULL }; + const char *argv[] = { "/bin/sh", "-c", cmd, NULL }; int pipeout[2]; pid_t child = fork_execv_on_steroids(flags, (char **)argv, pipeout, /*unsetenv_vec:*/ NULL, dir, /*uid (unused):*/ 0); |