[CRIU] [PATCH v2 1/3] cr-restore: "post-resume" hook introduced

[Pavel Emelyanov]

On 04/12/2016 12:04 PM, Pavel Emelyanov wrote:
> On 04/06/2016 01:08 PM, Stanislav Kinsburskiy wrote:
>> This hook is called at the very end, when everything is restored and processes
>> were resumed.
>> Can be used for some actions, which require operation container, like
>> restarting of systemd autofs services.
>>
>> v2:
>> Resmove code chunk, escaped from debugging
>>
>> Signed-off-by: Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>
>> ---
>>  criu/action-scripts.c         |    1 +
>>  criu/cr-restore.c             |    4 ++++
>>  criu/include/action-scripts.h |    1 +
>>  3 files changed, 6 insertions(+)
>>
>> diff --git a/criu/action-scripts.c b/criu/action-scripts.c
>> index 05aa9d0..b1f7952 100644
>> --- a/criu/action-scripts.c
>> +++ b/criu/action-scripts.c
>> @@ -20,6 +20,7 @@ static const char *action_names[ACT_MAX] = {
>>  	[ ACT_NET_UNLOCK ]	= "network-unlock",
>>  	[ ACT_SETUP_NS ]	= "setup-namespaces",
>>  	[ ACT_POST_SETUP_NS ]	= "post-setup-namespaces",
>> +	[ ACT_POST_RESUME ]	= "post-resume",
>>  };
>>  
>>  int run_scripts(enum script_actions act)
>> diff --git a/criu/cr-restore.c b/criu/cr-restore.c
>> index 0720c07..2b11b71 100644
>> --- a/criu/cr-restore.c
>> +++ b/criu/cr-restore.c
>> @@ -2198,6 +2198,10 @@ static int restore_root_task(struct pstree_item *init)
>>  	if (!opts.restore_detach && !opts.exec_cmd)
>>  		wait(NULL);
>>  
>> +	ret = run_scripts(ACT_POST_RESUME);
>> +	if (ret != 0)
>> +		pr_err("Post-resume script ret code %d\n", ret);
> 
> I guess this hook is better to run before we may stuck in the wait(NULL) above.

Ah, this was addressed in v3 series. I withdraw this comment.