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

options: Use union for @daemon and @restore_detach

Browse Source 
They both are using 'd' option in different context
though, lets give them two names.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Cyrill Gorcunov
2015-04-03 18:03:47 +03:00
committed by Pavel Emelyanov
parent 374017cfa4
commit 391d589482
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crtools.c
View File

@@ -558,10 +558,10 @@ int main(int argc, char *argv[], char *envp[])
} }
if (!strcmp(argv[optind], "page-server")) if (!strcmp(argv[optind], "page-server"))
return cr_page_server(opts.restore_detach, -1) > 0 ? 0 : 1; return cr_page_server(opts.daemon_mode, -1) > 0 ? 0 : 1;
if (!strcmp(argv[optind], "service")) if (!strcmp(argv[optind], "service"))
return cr_service(opts.restore_detach); return cr_service(opts.daemon_mode);
if (!strcmp(argv[optind], "dedup")) if (!strcmp(argv[optind], "dedup"))
return cr_dedup() != 0; return cr_dedup() != 0;

5
include/cr_options.h
View File

@@ -27,7 +27,10 @@ struct cr_options {
char *show_fmt; char *show_fmt;
bool check_ms_kernel; bool check_ms_kernel;
bool show_pages_content; bool show_pages_content;
bool restore_detach; union {
bool restore_detach;
bool daemon_mode;
};
bool restore_sibling; bool restore_sibling;
bool ext_unix_sk; bool ext_unix_sk;
bool shell_job; bool shell_job;