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

removed opentty now useless and fixed pid of root process for restart

Browse Source
This commit is contained in:
legoater 2008-10-23 13:09:01 +00:00
parent 6c5084efa4
commit ae4c254760
1 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lxc/restart.c
View File

@ -64,31 +64,6 @@ static inline long sys_restart(pid_t pid, int fd, unsigned long flags)
# warning "Architecture not supported for restart syscall" # warning "Architecture not supported for restart syscall"
#endif #endif
static int opentty(const char *ttyname)
{
int i, fd, flags;
fd = open(ttyname, O_RDWR | O_NONBLOCK);
if (fd == -1) {
lxc_log_syserror("open '%s'", ttyname);
return -1;
}
flags = fcntl(fd, F_GETFL);
flags &= ~O_NONBLOCK;
fcntl(fd, F_SETFL, flags);
for (i = 0; i < fd; i++)
close(i);
for (i = 0; i < 3; i++)
if (fd != i)
dup2(fd, i);
if (fd >= 3)
close(fd);
return 0;
}
int lxc_restart(const char *name, int cfd, unsigned long flags) int lxc_restart(const char *name, int cfd, unsigned long flags)
{ {
char *init = NULL, *val = NULL; char *init = NULL, *val = NULL;
@ -171,18 +146,12 @@ int lxc_restart(const char *name, int cfd, unsigned long flags)
return -1; return -1;
} }
/* Open the tty */
if (opentty(ttyname)) {
lxc_log_syserror("failed to open the tty");
return -1;
}
if (mount(ttyname, "/dev/console", "none", MS_BIND, 0)) { if (mount(ttyname, "/dev/console", "none", MS_BIND, 0)) {
lxc_log_syserror("failed to mount '/dev/console'"); lxc_log_syserror("failed to mount '/dev/console'");
return -1; return -1;
} }
sys_restart(pid, cfd, flags); sys_restart(getpid(), cfd, flags);
lxc_log_syserror("failed to restart"); lxc_log_syserror("failed to restart");
/* If the exec fails, tell that to our father */ /* If the exec fails, tell that to our father */