[CRIU] [PATCH] restore: call post-restore scripts before network-unlock

[Andrey Vagin]

post-restore script can fail, so it can't be called after network-unlock.

Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 cr-restore.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/cr-restore.c b/cr-restore.c
index f86041c..f3b3a4b 100644
--- a/cr-restore.c
+++ b/cr-restore.c
@@ -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");
-- 
1.8.5.3