Commit 4bc2f7a6 authored by Tycho Andersen's avatar Tycho Andersen Committed by Pavel Emelyanov

inventory, lsm: remember to set has_lsmtype

In another "how did this ever work" moment, sometimes this wasn't set and
we didn't propagate the LSM. Let's set it :)
Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 88620fa5
...@@ -57,7 +57,10 @@ int check_img_inventory(void) ...@@ -57,7 +57,10 @@ int check_img_inventory(void)
root_cg_set = he->root_cg_set; 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) { switch (he->img_version) {
case CRTOOLS_IMAGES_V1: case CRTOOLS_IMAGES_V1:
...@@ -113,6 +116,7 @@ int prepare_inventory(InventoryEntry *he) ...@@ -113,6 +116,7 @@ int prepare_inventory(InventoryEntry *he)
he->has_fdinfo_per_id = true; he->has_fdinfo_per_id = true;
he->ns_per_id = true; he->ns_per_id = true;
he->has_ns_per_id = true; he->has_ns_per_id = true;
he->has_lsmtype = true;
he->lsmtype = host_lsm_type(); he->lsmtype = host_lsm_type();
crt.i.pid.state = TASK_ALIVE; crt.i.pid.state = TASK_ALIVE;
......
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