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

c/r: don't fail if there is no console_fd on restore

Browse Source 
If we set lxc.console=none, this fd won't exist, so let's not fail if it
doesn't. We already partially handled this case correctly, so let's
actually handle it correctly :)

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
This commit is contained in:
Tycho Andersen 2016-03-21 16:52:02 -06:00
parent 36d2096cf4
commit 97e4f1a91f
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lxc/criu.c
View File

@ -290,6 +290,11 @@ static void exec_criu(struct criu_opts *opts)
DECLARE_ARG(opts->cgroup_path); DECLARE_ARG(opts->cgroup_path);
if (tty_info[0]) { if (tty_info[0]) {
if (opts->console_fd < 0) {
ERROR("lxc.console configured on source host but not target");
goto err;
}
ret = snprintf(buf, sizeof(buf), "fd[%d]:%s", opts->console_fd, tty_info); ret = snprintf(buf, sizeof(buf), "fd[%d]:%s", opts->console_fd, tty_info);
if (ret < 0 || ret >= sizeof(buf)) if (ret < 0 || ret >= sizeof(buf))
goto err; goto err;
@ -624,12 +629,13 @@ void do_restore(struct lxc_container *c, int status_pipe, char *directory, bool
os.cgroup_path = cgroup_canonical_path(handler); os.cgroup_path = cgroup_canonical_path(handler);
os.console_fd = c->lxc_conf->console.slave; os.console_fd = c->lxc_conf->console.slave;
if (os.console_fd >= 0) {
/* Twiddle the FD_CLOEXEC bit. We want to pass this FD to criu /* Twiddle the FD_CLOEXEC bit. We want to pass this FD to criu
* via --inherit-fd, so we don't want it to close. * via --inherit-fd, so we don't want it to close.
*/ */
flags = fcntl(os.console_fd, F_GETFD); flags = fcntl(os.console_fd, F_GETFD);
if (flags < 0) { if (flags < 0) {
SYSERROR("F_GETFD failed"); SYSERROR("F_GETFD failed: %d", os.console_fd);
goto out_fini_handler; goto out_fini_handler;
} }
@ -639,6 +645,7 @@ void do_restore(struct lxc_container *c, int status_pipe, char *directory, bool
SYSERROR("F_SETFD failed"); SYSERROR("F_SETFD failed");
goto out_fini_handler; goto out_fini_handler;
} }
}
os.console_name = c->lxc_conf->console.name; os.console_name = c->lxc_conf->console.name;
/* exec_criu() returning is an error */ /* exec_criu() returning is an error */