Merge pull request #1743 from kolyshkin/1741-followup

Followups to #1741

Author: giuseppe

src/libcrun/criu.c

@@ -480,7 +480,7 @@ libcrun_container_checkpoint_linux_criu (libcrun_container_status_t *status, lib
     {
       ret = mkdir (cr_options->work_path, 0700);
       if (UNLIKELY ((ret == -1) && (errno != EEXIST)))
-        return crun_make_error (err, errno, "error creating CRIU work directory `%s`", cr_options->image_path);
+        return crun_make_error (err, errno, "error creating CRIU work directory `%s`", cr_options->work_path);
 
       work_fd = open (cr_options->work_path, O_DIRECTORY | O_CLOEXEC);
       if (UNLIKELY (work_fd == -1))
@@ -861,6 +861,10 @@ libcrun_container_restore_linux_criu (libcrun_container_status_t *status, libcru
    * crun to set it if the user has not selected a specific directory. */
   if (cr_options->work_path != NULL)
     {
+      ret = mkdir (cr_options->work_path, 0700);
+      if (UNLIKELY ((ret == -1) && (errno != EEXIST)))
+        return crun_make_error (err, errno, "error creating CRIU work directory `%s`", cr_options->work_path);
+
       work_fd = open (cr_options->work_path, O_DIRECTORY | O_CLOEXEC);
       if (UNLIKELY (work_fd == -1))
         return crun_make_error (err, errno, "error opening CRIU work directory `%s`", cr_options->work_path);

tests/test_checkpoint_restore.py

@@ -161,6 +161,7 @@ def _get_pre_dump_size(cr_dir):
 
     cid = None
     cr_dir = os.path.join(get_tests_root(), 'pre-dump')
+    work_dir = 'work-dir'
     try:
         _, cid = run_and_get_output(
             conf,
@@ -187,7 +188,6 @@ def _get_pre_dump_size(cr_dir):
 
         # Do the final dump. This dump should be much smaller.
         cr_dir = os.path.join(get_tests_root(), 'checkpoint')
-        work_dir = 'work-dir'
         run_crun_command([
             "checkpoint",
             "--parent-path=../pre-dump",