proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 12:56:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1075 from tych0/criu-action-script

Browse Source 
c/r: add support for CRIU's --action-script
This commit is contained in:
Christian Brauner 2016-07-08 01:11:27 +02:00 committed by GitHub
commit b9aae26f1b
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lxc/criu.c
View File

@ -185,6 +185,9 @@ static void exec_criu(struct criu_opts *opts)
if (opts->user->verbose) if (opts->user->verbose)
static_args++; static_args++;
if (opts->user->action_script)
static_args += 2;
ret = snprintf(log, PATH_MAX, "%s/%s.log", opts->user->directory, opts->action); ret = snprintf(log, PATH_MAX, "%s/%s.log", opts->user->directory, opts->action);
if (ret < 0 || ret >= PATH_MAX) { if (ret < 0 || ret >= PATH_MAX) {
ERROR("logfile name too long\n"); ERROR("logfile name too long\n");
@ -235,6 +238,11 @@ static void exec_criu(struct criu_opts *opts)
if (opts->user->verbose) if (opts->user->verbose)
DECLARE_ARG("-vvvvvv"); DECLARE_ARG("-vvvvvv");
if (opts->user->action_script) {
DECLARE_ARG("--action-script");
DECLARE_ARG(opts->user->action_script);
}
if (strcmp(opts->action, "dump") == 0 || strcmp(opts->action, "pre-dump") == 0) { if (strcmp(opts->action, "dump") == 0 || strcmp(opts->action, "pre-dump") == 0) {
char pid[32], *freezer_relative; char pid[32], *freezer_relative;

5
src/lxc/lxccontainer.h
View File

@ -891,6 +891,11 @@ struct migrate_opts {
* won't if e.g. you rsync the filesystems between two machines. * won't if e.g. you rsync the filesystems between two machines.
*/ */
bool preserves_inodes; bool preserves_inodes;
/* Path to an executable script that will be registered as a criu
* "action script"
*/
char *action_script;
}; };
/*! /*!