proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-07 13:41:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

close also inherited fd in lxc-execute

Browse Source 
This is a complement of previous patches d983b93c3a
and af79587587 about inherited fd.

Here this is required for the lxc-execute that have a specific
lxc-init procress.

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Michel Normand 2009-07-24 15:25:45 +02:00 committed by Daniel Lezcano
parent c8c9ce7a2b
commit 72439b9f8b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/lxc_init.c
View File

@ -32,8 +32,7 @@
#include <sys/mount.h> #include <sys/mount.h>
#define _GNU_SOURCE #define _GNU_SOURCE
#include <getopt.h> #include <getopt.h>
#include "log.h" #include "lxc.h"
#include "error.h"
lxc_log_define(lxc_init, lxc); lxc_log_define(lxc_init, lxc);
@ -59,6 +58,8 @@ static int mount_fs(const char *source, const char *target, const char *type)
return -1; return -1;
} }
DEBUG("'%s' mounted on '%s'", source, target);
return 0; return 0;
} }
@ -66,6 +67,7 @@ static inline int setup_fs(void)
{ {
if (mount_fs("proc", "/proc", "proc")) if (mount_fs("proc", "/proc", "proc"))
return -1; return -1;
if (mount_fs("shmfs", "/dev/shm", "tmpfs")) if (mount_fs("shmfs", "/dev/shm", "tmpfs"))
return -1; return -1;
@ -114,11 +116,19 @@ int main(int argc, char *argv[])
if (setup_fs()) if (setup_fs())
exit(err); exit(err);
NOTICE("about to exec '%s'", aargv[0]);
execvp(aargv[0], aargv); execvp(aargv[0], aargv);
ERROR("failed to exec: '%s' : %s", aargv[0], strerror(errno)); ERROR("failed to exec: '%s' : %s", aargv[0], strerror(errno));
exit(err); exit(err);
} }
err = lxc_close_all_inherited_fd();
if (err) {
ERROR("unable to close inherited fds");
goto out;
}
err = 0; err = 0;
for (;;) { for (;;) {
int status; int status;