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

Change access mount and check on the console

Browse Source 
From: Daniel Lezcano <dlezcano@fr.ibm.com>

Changed to access the console to the rootfs directly.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
dlezcano 2008-12-09 17:38:18 +00:00
parent 719c46e12b
commit ed502555f4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lxc/lxc_conf.c
View File

@ -668,10 +668,14 @@ static int setup_rootfs(const char *name)
static int setup_console(const char *name, const char *tty)
{
if (access("/dev/console", R_OK|W_OK))
char console[MAXPATHLEN];
snprintf(console, MAXPATHLEN, LXCPATH "/%s/rootfs/dev/console", name);
if (access(console, R_OK|W_OK))
return 0;
if (mount(tty, "/dev/console", "none", MS_BIND, 0)) {
if (mount(tty, console, "none", MS_BIND, 0)) {
lxc_log_error("failed to mount the console");
return -1;
}
@ -1411,15 +1415,15 @@ int lxc_setup(const char *name, const char *tty)
return -LXC_ERROR_SETUP_MOUNT;
}
if (conf_has_rootfs(name) && setup_rootfs(name)) {
lxc_log_error("failed to set rootfs for '%s'", name);
return -LXC_ERROR_SETUP_ROOTFS;
}
if (tty[0] && setup_console(name, tty)) {
lxc_log_error("failed to setup the console for '%s'", name);
return -LXC_ERROR_SETUP_CONSOLE;
}
if (conf_has_rootfs(name) && setup_rootfs(name)) {
lxc_log_error("failed to set rootfs for '%s'", name);
return -LXC_ERROR_SETUP_ROOTFS;
}
return 0;
}