Commit b0115358 authored by Pavel Emelyanov's avatar Pavel Emelyanov

img: Always assume images to be v1.1

Only if inventory says it's v1 -- switch to old scheme.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 11c4094c
...@@ -1678,8 +1678,6 @@ int cr_pre_dump_tasks(pid_t pid) ...@@ -1678,8 +1678,6 @@ int cr_pre_dump_tasks(pid_t pid)
opts.final_state = TASK_ALIVE; opts.final_state = TASK_ALIVE;
} }
img_common_magic = true;
if (init_stats(DUMP_STATS)) if (init_stats(DUMP_STATS))
goto err; goto err;
...@@ -1771,8 +1769,6 @@ int cr_dump_tasks(pid_t pid) ...@@ -1771,8 +1769,6 @@ int cr_dump_tasks(pid_t pid)
int post_dump_ret = 0; int post_dump_ret = 0;
int ret = -1; int ret = -1;
img_common_magic = true;
pr_info("========================================\n"); pr_info("========================================\n");
pr_info("Dumping processes (pid: %d)\n", pid); pr_info("Dumping processes (pid: %d)\n", pid);
pr_info("========================================\n"); pr_info("========================================\n");
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
bool fdinfo_per_id = false; bool fdinfo_per_id = false;
bool ns_per_id = false; bool ns_per_id = false;
bool img_common_magic = false; bool img_common_magic = true;
TaskKobjIdsEntry *root_ids; TaskKobjIdsEntry *root_ids;
u32 root_cg_set; u32 root_cg_set;
...@@ -54,10 +54,10 @@ int check_img_inventory(void) ...@@ -54,10 +54,10 @@ int check_img_inventory(void)
switch (he->img_version) { switch (he->img_version) {
case CRTOOLS_IMAGES_V1: case CRTOOLS_IMAGES_V1:
/* good old images. OK */ /* good old images. OK */
img_common_magic = false;
break; break;
case CRTOOLS_IMAGES_V1_1: case CRTOOLS_IMAGES_V1_1:
/* newer images with extra magic in the head */ /* newer images with extra magic in the head */
img_common_magic = true;
break; break;
default: default:
pr_err("Not supported images version %u\n", he->img_version); pr_err("Not supported images version %u\n", he->img_version);
......
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