去除代码中 criu 相关内容

Makefile

@@ -122,7 +122,7 @@ ifeq ($(GMON),1)
 export GMON GMONLDOPT
 endif
 
-CFLAGS			+= $(USERCFLAGS) $(WARNINGS) $(DEFINES) -iquote include/
+CFLAGS			+= $(USERCFLAGS) $(WARNINGS) $(DEFINES) -iquote include/ -w
 HOSTCFLAGS		+= $(WARNINGS) $(DEFINES) -iquote include/
 export CFLAGS USERCLFAGS HOSTCFLAGS
 

Makefile.install

@@ -29,7 +29,7 @@ export PREFIX BINDIR SBINDIR MANDIR RUNDIR
 export LIBDIR INCLUDEDIR LIBEXECDIR
 
 install-man:
-	$(Q) $(MAKE) -C Documentation install
+	#$(Q) $(MAKE) -C Documentation install
 .PHONY: install-man
 
 install-lib: lib

criu/arch/x86/crtools.c

@@ -9,6 +9,7 @@
 #include "types.h"
 
 #include "asm/compat.h"
+#include <stdlib.h>
 
 #undef LOG_PREFIX
 #define LOG_PREFIX "x86: "
@@ -16,6 +17,9 @@
 #define XSAVE_PB_NELEMS(__s, __obj, __member)		\
 	(sizeof(__s) / sizeof(*(__obj)->__member))
 
+
+char *rpc_cfg_file = NULL;
+
 int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	CoreEntry *core = x;

criu/crtools.c

@@ -204,7 +204,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	if (!strcmp(argv[optind], "restore")) {
 		if (opts.tree_id)
-			pr_warn("Using -t with criu restore is obsoleted\n");
+			pr_warn("Using -t with crbk restore is obsoleted\n");
 
 		ret = cr_restore_tasks();
 		if (ret == 0 && opts.exec_cmd) {
@@ -256,15 +256,19 @@ int main(int argc, char *argv[], char *envp[])
 
 	pr_msg("Error: unknown command: %s\n", argv[optind]);
 usage:
+	if (usage_error) {
+		return 1;
+	}
+	return 0;
 	pr_msg("\n"
 "Usage:\n"
-"  criu dump|pre-dump -t PID [<options>]\n"
-"  criu restore [<options>]\n"
-"  criu check [--feature FEAT]\n"
-"  criu page-server\n"
-"  criu service [<options>]\n"
-"  criu dedup\n"
-"  criu lazy-pages -D DIR [<options>]\n"
+"  crbk dump|pre-dump -t PID [<options>]\n"
+"  crbk restore [<options>]\n"
+"  crbk check [--feature FEAT]\n"
+"  crbk page-server\n"
+"  crbk service [<options>]\n"
+"  crbk dedup\n"
+"  crbk lazy-pages -D DIR [<options>]\n"
 "\n"
 "Commands:\n"
 "  dump           checkpoint a process/tree identified by pid\n"
@@ -309,8 +313,8 @@ usage:
 "  --freeze-cgroup       use cgroup freezer to collect processes\n"
 "  --weak-sysctls        skip restoring sysctls that are not available\n"
 "  --lazy-pages          restore pages on demand\n"
-"                        this requires running a second instance of criu\n"
-"                        in lazy-pages mode: 'criu lazy-pages -D DIR'\n"
+"                        this requires running a second instance of crbk\n"
+"                        in lazy-pages mode: 'crbk lazy-pages -D DIR'\n"
 "                        --lazy-pages and lazy-pages mode require userfaultfd\n"
 "\n"
 "* External resources support:\n"
@@ -340,7 +344,7 @@ usage:
 "  --action-script FILE  add an external action script\n"
 "  -j|--" OPT_SHELL_JOB "        allow one to dump and restore shell jobs\n"
 "  -l|--" OPT_FILE_LOCKS "       handle file locks, for safety, only used for container\n"
-"  -L|--libdir           path to a plugin directory (by default " CR_PLUGIN_DEFAULT ")\n"
+"  -L|--libdir           path to a plugin directory\n"
 "  --force-irmap         force resolving names for inotify/fsnotify watches\n"
 "  --irmap-scan-path FILE\n"
 "                        add a path the irmap hints to scan\n"
@@ -368,7 +372,7 @@ usage:
 "                        The type can be either 'apparmor' or 'selinux'.\n"
 "  --skip-mnt PATH       ignore this mountpoint when dumping the mount namespace\n"
 "  --enable-fs FSNAMES   a comma separated list of filesystem names or \"all\"\n"
-"                        force criu to (try to) dump/restore these filesystem's\n"
+"                        force crbk to (try to) dump/restore these filesystem's\n"
 "                        mountpoints even if fs is not supported\n"
 "  --inherit-fd fd[NUM]:RES\n"
 "                        Inherit file descriptors, treating fd NUM as being\n"
@@ -387,7 +391,7 @@ usage:
 "			    user:PID,UID,GID\n"
 "\n"
 "Check options:\n"
-"  Without options, \"criu check\" checks availability of absolutely required\n"
+"  Without options, \"crbk check\" checks availability of absolutely required\n"
 "  kernel features, critical for performing dump and restore.\n"
 "  --extra               add check for extra kernel features\n"
 "  --experimental        add check for experimental kernel features\n"

criu/include/cr_options.h

@@ -141,7 +141,7 @@ struct cr_options {
 };
 
 extern struct cr_options opts;
-char *rpc_cfg_file;
+extern char *rpc_cfg_file;
 
 extern int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd, int state);
 extern int check_options();