From: Michel Normand <normand@fr.ibm.com>
Date: Mon, 18 May 2009 20:27:36 +0000 (+0200)
Subject: lxc-checkpoint ad lxc-restart to return 255 in case of error
X-Git-Tag: lxc_0_6_3~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a30284df84bd32db0eedafdaff44203ab317e176;p=thirdparty%2Flxc.git

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>
---

diff --git a/src/lxc/lxc_checkpoint.c b/src/lxc/lxc_checkpoint.c
index e0be048dd..fe0557b6c 100644
--- 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;
 }
diff --git a/src/lxc/lxc_restart.c b/src/lxc/lxc_restart.c
index 3ac5b35e8..1727fe209 100644
--- 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;
 }