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

lxc-destroy return 255 in case of error

Browse Source 
to have same exit code for all lxc commands

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Michel Normand 2009-05-18 22:27:35 +02:00 committed by Daniel Lezcano
parent 7f8306138a
commit 79507e493e
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/destroy.c
View File

@ -39,7 +39,7 @@ static int remove_lxc_directory(const char *dirname)
{ {
char path[MAXPATHLEN]; char path[MAXPATHLEN];
sprintf(path, LXCPATH "/%s", dirname); snprintf(path, MAXPATHLEN, LXCPATH "/%s", dirname);
if (rmdir(path)) { if (rmdir(path)) {
SYSERROR("failed to remove %s directory", path); SYSERROR("failed to remove %s directory", path);
@ -51,12 +51,12 @@ static int remove_lxc_directory(const char *dirname)
int lxc_destroy(const char *name) int lxc_destroy(const char *name)
{ {
int lock, ret = -LXC_ERROR_INTERNAL; int lock, ret = -1;
char path[MAXPATHLEN]; char path[MAXPATHLEN];
lock = lxc_get_lock(name); lock = lxc_get_lock(name);
if (lock < 0) if (lock < 0)
return lock; return ret;
if (lxc_rmstate(name)) { if (lxc_rmstate(name)) {
ERROR("failed to remove state file for %s", name); ERROR("failed to remove state file for %s", name);

16
src/lxc/lxc_destroy.c
View File

@ -22,7 +22,6 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <libgen.h>
#include <sys/types.h> #include <sys/types.h>
#include <lxc/lxc.h> #include <lxc/lxc.h>
@ -48,20 +47,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;
ret = lxc_destroy(my_args.name); return lxc_destroy(my_args.name);
if (ret)
return 1;
return 0;
} }