Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-21 01:06:58 +00:00
Code Issues Projects Releases Wiki Activity

lock: Show long option in log message about using one

Browse source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov 2013-03-27 20:17:59 +04:00
parent 25ef419982
commit 87d0d61e41
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cr-dump.c
View file

@ -1087,7 +1087,7 @@ static int collect_file_locks(const struct cr_options *opts)
*/
if (!list_empty(&file_lock_list)) {
pr_err("Some file locks are hold by dumping tasks!"
"You can try -l to dump them.\n");
"You can try --" OPT_FILE_LOCKS " to dump them.\n");
return -1;
}

5
crtools.c
View file

@ -28,6 +28,7 @@
#include "version.h"
#include "page-xfer.h"
#include "tty.h"
#include "file-lock.h"
struct cr_options opts;
@ -107,7 +108,7 @@ int main(int argc, char *argv[])
{ "action-script", required_argument, 0, 49},
{ LREMAP_PARAM, no_argument, 0, 41},
{ OPT_SHELL_JOB, no_argument, 0, 'j'},
{ "file-locks", no_argument, 0, 'l'},
{ OPT_FILE_LOCKS, no_argument, 0, 'l'},
{ "page-server", no_argument, 0, 50},
{ "address", required_argument, 0, 51},
{ "port", required_argument, 0, 52},
@ -363,7 +364,7 @@ usage:
pr_msg(" * network-lock - lock network in a target network namespace\n");
pr_msg(" * network-unlock - unlock network in a target network namespace\n");
pr_msg(" -j|--%s allow to dump and restore shell jobs\n", OPT_SHELL_JOB);
pr_msg(" -l|--file-locks handle file locks, for safety, only used for container\n");
pr_msg(" -l|--%s handle file locks, for safety, only used for container\n", OPT_FILE_LOCKS);
pr_msg("\n* Logging:\n");
pr_msg(" -o|--log-file [NAME] log file name (relative path is relative to --images-dir)\n");

2
include/file-lock.h
View file

@ -53,4 +53,6 @@ extern int dump_task_file_locks(struct parasite_ctl *ctl,
extern int prepare_file_locks(int pid);
#define OPT_FILE_LOCKS "file-locks"
#endif /* __FILE_LOCK_H__ */