From a7fb6a1f4192e29587708d139ef081004e94075b Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Mon, 31 Mar 2014 22:00:00 +0400 Subject: [PATCH] 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: Andrey Vagin Reviewed-by: Cyrill Gorcunov Signed-off-by: Pavel Emelyanov --- cr-restore.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cr-restore.c b/cr-restore.c index f86041c4b..f3b3a4b5a 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");