mirror of
https://github.com/checkpoint-restore/criu
synced 2025-08-31 14:25:49 +00:00
Revert "util: Add "/bin" to PATH when spawning helpers"
This reverts commit 66ab5e1ad8
.
After Andrey's fixes that create mount points before dropping
old mounts and going to pivot_root, this patch is not needed.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
44
util.c
44
util.c
@@ -481,47 +481,6 @@ int run_scripts(char *action)
|
||||
ret__; \
|
||||
})
|
||||
|
||||
static int fixup_env(void)
|
||||
{
|
||||
char *ep, *nep;
|
||||
int len;
|
||||
|
||||
/*
|
||||
* FIXME
|
||||
*
|
||||
* We sometimes call other tools inside namespace
|
||||
* we restore. Host system may not have PATH properly
|
||||
* reflecting where the tools are in other namespaces.
|
||||
*
|
||||
* E.g. when restoring Centos6 container from FC20
|
||||
* host we fail to find /bin/tar, as in FC20 /bin is
|
||||
* not in PATH.
|
||||
*
|
||||
* It's not cool at all, things we think we call might
|
||||
* not coincide with what is really called. Proper fix
|
||||
* will come a bit later.
|
||||
*/
|
||||
|
||||
ep = getenv("PATH");
|
||||
if (!ep)
|
||||
return 0;
|
||||
|
||||
len = strlen(ep);
|
||||
nep = xmalloc(len + sizeof("/bin:"));
|
||||
if (!nep)
|
||||
return -1;
|
||||
|
||||
sprintf(nep, "/bin:%s", ep);
|
||||
if (setenv("PATH", nep, 1)) {
|
||||
pr_perror("Failed to override PATH");
|
||||
xfree(nep);
|
||||
return -1;
|
||||
}
|
||||
|
||||
xfree(nep);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* If "in" is negative, stdin will be closed.
|
||||
* If "out" or "err" are negative, a log file descriptor will be used.
|
||||
@@ -544,9 +503,6 @@ int cr_system(int in, int out, int err, char *cmd, char *const argv[])
|
||||
pr_perror("fork() failed");
|
||||
goto out;
|
||||
} else if (pid == 0) {
|
||||
if (fixup_env())
|
||||
goto out_chld;
|
||||
|
||||
if (out < 0)
|
||||
out = log_get_fd();
|
||||
if (err < 0)
|
||||
|
Reference in New Issue
Block a user