Skip to content

[RFC] Revert partially "criu: handle symlink mount dests" #1757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
giuseppe wants to merge 1 commit into from
Closed

[RFC] Revert partially "criu: handle symlink mount dests" #1757

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/libcrun/criu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,10 @@ libcrun_container_checkpoint_linux_criu (libcrun_container_status_t *status, lib
const char *dest_in_root;

dest_in_root = chroot_realpath (rootfs, def->mounts[i]->destination, buf);
if (UNLIKELY (dest_in_root == NULL))
return crun_make_error (err, errno, "unable to resolve external bind mount `%s` under rootfs", def->mounts[i]->destination);
dest_in_root += strlen (rootfs);
if (LIKELY (dest_in_root != NULL))
dest_in_root += strlen (rootfs);
else
dest_in_root = def->mounts[i]->destination;

ret = libcriu_wrapper->criu_add_ext_mount (dest_in_root, dest_in_root);
if (UNLIKELY (ret < 0))
Expand Down Expand Up @@ -916,9 +917,10 @@ libcrun_container_restore_linux_criu (libcrun_container_status_t *status, libcru
const char *dest_in_root;

dest_in_root = chroot_realpath (rootfs, def->mounts[i]->destination, buf);
if (UNLIKELY (dest_in_root == NULL))
return crun_make_error (err, errno, "unable to resolve external bind mount `%s` under rootfs", def->mounts[i]->destination);
dest_in_root += strlen (rootfs);
if (LIKELY (dest_in_root != NULL))
dest_in_root += strlen (rootfs);
else
dest_in_root = def->mounts[i]->destination;

ret = libcriu_wrapper->criu_add_ext_mount (dest_in_root, def->mounts[i]->source);
if (UNLIKELY (ret < 0))
Expand Down