lxc-checkpoint ad lxc-restart to return 255 in case of error

to have same exit code for all lxc commands Note that the lxc-restart is not yet reporting the error of restarted application as done with lxc-start. Signed-off-by: Michel Normand <normand@fr.ibm.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

lxc-checkpoint ad lxc-restart to return 255 in case of error
a30284df · Michel Normand · Daniel Lezcano · c8f55b0e · a30284df · a30284df
Commit a30284df authored May 18, 2009 by Michel Normand Committed by Daniel Lezcano May 18, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 14 deletions

lxc_checkpoint.c src/lxc/lxc_checkpoint.c +6 -7

lxc_restart.c src/lxc/lxc_restart.c +4 -7

No files found.
--- a/src/lxc/lxc_checkpoint.c
+++ b/src/lxc/lxc_checkpoint.c
@@ -69,18 +69,17 @@ Options :\n\

 int main(int argc, char *argv[])
 {
-	int ret;
+	int ret = -1;

-	ret = lxc_arguments_parse(&my_args, argc, argv);
-	if (ret)
-		return 1;
+	if (lxc_arguments_parse(&my_args, argc, argv))
+		return ret;

 	if (lxc_log_init(my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet))
-		return -1;
+		return ret;

 	if (lxc_freeze(my_args.name))
-		return -1;
+		return ret;

 	if (lxc_checkpoint(my_args.name, my_args.argv[0], 0))
 		goto out;
@@ -94,7 +93,7 @@ int main(int argc, char *argv[])

 out:
 	if (lxc_unfreeze(my_args.name))
-		return 1;
+		return -1;

 	return ret;
 }
--- a/src/lxc/lxc_restart.c
+++ b/src/lxc/lxc_restart.c
@@ -58,18 +58,15 @@ Options :\n\

 int main(int argc, char *argv[])
 {
-	int ret;
-
-	ret = lxc_arguments_parse(&my_args, argc, argv);
-	if (ret)
-		return 1;
+	if (lxc_arguments_parse(&my_args, argc, argv))
+		return -1;

 	if (lxc_log_init(my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet))
-		return 1;
+		return -1;

 	if (lxc_restart(my_args.name, my_args.argv[0], 0))
-		return 1;
+		return -1;

 	return 0;
 }