Commit dd375ceb authored by Tycho Andersen's avatar Tycho Andersen Committed by Pavel Emelyanov

restore: don't restore cg props if task restore fails

Once the task restore has failed, we can just abort, no need to restore the cg
props.
Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
Acked-by: 's avatarAndrew Vagin <avagin@parallels.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent c32046c9
...@@ -1821,11 +1821,11 @@ int cr_restore_tasks(void) ...@@ -1821,11 +1821,11 @@ int cr_restore_tasks(void)
if (criu_signals_setup() < 0) if (criu_signals_setup() < 0)
goto err; goto err;
ret = restore_root_task(root_item); if (restore_root_task(root_item) < 0)
if (prepare_cgroup_properties() < 0)
goto err; goto err;
ret = prepare_cgroup_properties();
err: err:
fini_cgroup(); fini_cgroup();
cr_plugin_fini(); cr_plugin_fini();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment