Commit a7fb6a1f authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

restore: call post-restore scripts before network-unlock

post-restore script can fail, so it can't be called after network-unlock.
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Reviewed-by: 's avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 0bae3bc1
......@@ -1516,6 +1516,14 @@ static int restore_root_task(struct pstree_item *init)
goto out_kill;
}
ret = run_scripts("post-restore");
if (ret != 0) {
pr_err("Aborting restore due to script ret code %d\n", ret);
timing_stop(TIME_RESTORE);
write_stats(RESTORE_STATS);
goto out_kill;
}
/* Unlock network before disabling repair mode on sockets */
network_unlock();
......@@ -1529,13 +1537,6 @@ static int restore_root_task(struct pstree_item *init)
timing_stop(TIME_RESTORE);
ret = run_scripts("post-restore");
if (ret != 0) {
pr_warn("Aborting restore due to script ret code %d\n", ret);
write_stats(RESTORE_STATS);
goto out_kill;
}
ret = attach_to_tasks();
pr_info("Restore finished successfully. Resuming tasks.\n");
......
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