[CRIU] [PATCH 3/4] inventory, lsm: remember to set has_lsmtype

Pavel Emelyanov xemul at virtuozzo.com
Thu Oct 6 23:47:56 PDT 2016


On 10/06/2016 06:30 PM, Tycho Andersen wrote:
> In another "how did this ever work" moment, sometimes this wasn't set and
> we didn't propagate the LSM. 

:D :D :D

> Let's set it :)
> 
> Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
> ---
>  criu/image.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/criu/image.c b/criu/image.c
> index a3bb285..4cb2be3 100644
> --- a/criu/image.c
> +++ b/criu/image.c
> @@ -57,7 +57,10 @@ int check_img_inventory(void)
>  		root_cg_set = he->root_cg_set;
>  	}
>  
> -	image_lsm = he->lsmtype;
> +	if (he->has_lsmtype)
> +		image_lsm = he->lsmtype;
> +	else
> +		image_lsm = LSMTYPE__NO_LSM;
>  
>  	switch (he->img_version) {
>  	case CRTOOLS_IMAGES_V1:
> @@ -113,6 +116,7 @@ int prepare_inventory(InventoryEntry *he)
>  	he->has_fdinfo_per_id = true;
>  	he->ns_per_id = true;
>  	he->has_ns_per_id = true;
> +	he->has_lsmtype = true;
>  	he->lsmtype = host_lsm_type();
>  
>  	crt.i.pid.state = TASK_ALIVE;
> 



More information about the CRIU mailing list