mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 06:45:35 +00:00
Code Issues Releases Wiki Activity

inventory: Kill inventory.img file in case of failed dump

Browse Source 
This will result in more sane error in case restore is launched
on such semi-complete images.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2013-03-27 16:16:25 +04:00
parent c03a4c5801
commit cbf0ba9f48
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cr-dump.c
View File

@@ -1600,9 +1600,10 @@ err:
close_safe(&pidns_proc); close_safe(&pidns_proc);
if (ret) if (ret) {
kill_inventory();
pr_err("Dumping FAILED.\n"); pr_err("Dumping FAILED.\n");
else } else
pr_info("Dumping finished successfully\n"); pr_info("Dumping finished successfully\n");
return ret; return ret;

6
image.c
View File

@@ -86,6 +86,12 @@ int write_img_inventory(void)
return 0; return 0;
} }
void kill_inventory(void)
{
unlinkat(get_service_fd(IMG_FD_OFF),
fdset_template[CR_FD_INVENTORY].fmt, 0);
}
static void show_inventory(int fd, struct cr_options *o) static void show_inventory(int fd, struct cr_options *o)
{ {
pb_show_vertical(fd, PB_INVENTORY); pb_show_vertical(fd, PB_INVENTORY);

1
include/crtools.h
View File

@@ -179,6 +179,7 @@ void show_rlimit(int fd, struct cr_options *o);
int check_img_inventory(void); int check_img_inventory(void);
int write_img_inventory(void); int write_img_inventory(void);
void kill_inventory(void);
extern void print_data(unsigned long addr, unsigned char *data, size_t size); extern void print_data(unsigned long addr, unsigned char *data, size_t size);
extern void print_image_data(int fd, unsigned int length, int show); extern void print_image_data(int fd, unsigned int length, int show);