Commit c8f55b0e by Michel Normand Committed by Daniel Lezcano

lxc-freeze and lxc-unfreeze to return 255 in case of error

to have same exit code for all lxc commands Signed-off-by: 's avatarMichel Normand <normand@fr.ibm.com> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent f4072342
...@@ -75,22 +75,16 @@ static int freeze_unfreeze(const char *name, int freeze) ...@@ -75,22 +75,16 @@ static int freeze_unfreeze(const char *name, int freeze)
int lxc_freeze(const char *name) int lxc_freeze(const char *name)
{ {
if (freeze_unfreeze(name, 1)) if (freeze_unfreeze(name, 1))
return -LXC_ERROR_INTERNAL; return -1;
if (lxc_setstate(name, FROZEN))
return -LXC_ERROR_INTERNAL;
return 0; return lxc_setstate(name, FROZEN);
} }
int lxc_unfreeze(const char *name) int lxc_unfreeze(const char *name)
{ {
if (freeze_unfreeze(name, 0)) if (freeze_unfreeze(name, 0))
return -LXC_ERROR_INTERNAL; return -1;
if (lxc_setstate(name, RUNNING))
return -LXC_ERROR_INTERNAL;
return 0; return lxc_setstate(name, RUNNING);
} }
...@@ -49,19 +49,13 @@ Options :\n\ ...@@ -49,19 +49,13 @@ Options :\n\
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int ret; if (lxc_arguments_parse(&my_args, argc, argv))
return -1;
ret = lxc_arguments_parse(&my_args, argc, argv);
if (ret)
return 1;
if (lxc_log_init(my_args.log_file, my_args.log_priority, if (lxc_log_init(my_args.log_file, my_args.log_priority,
my_args.progname, my_args.quiet)) my_args.progname, my_args.quiet))
return 1; return -1;
if (lxc_freeze(my_args.name))
return 1;
return 0; return lxc_freeze(my_args.name);
} }
...@@ -48,19 +48,13 @@ Options :\n\ ...@@ -48,19 +48,13 @@ Options :\n\
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int ret; if (lxc_arguments_parse(&my_args, argc, argv))
return -1;
ret = lxc_arguments_parse(&my_args, argc, argv);
if (ret)
return 1;
if (lxc_log_init(my_args.log_file, my_args.log_priority, if (lxc_log_init(my_args.log_file, my_args.log_priority,
my_args.progname, my_args.quiet)) my_args.progname, my_args.quiet))
return 1; return -1;
if (lxc_unfreeze(my_args.name))
return 1;
return 0; return lxc_unfreeze(my_args.name);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment