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

Merge pull request #811 from hallyn/2016-02-09/destroyquiet

Browse Source 
lxc_destroy: be quiet if asked
This commit is contained in:
Christian Brauner 2016-02-10 01:25:04 +01:00
commit 2fa8e2cd0a
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lxc/lxc_destroy.c
View File

@ -33,6 +33,7 @@
lxc_log_define(lxc_destroy_ui, lxc); lxc_log_define(lxc_destroy_ui, lxc);
static int my_parser(struct lxc_arguments* args, int c, char* arg); static int my_parser(struct lxc_arguments* args, int c, char* arg);
static bool quiet;
static const struct option my_longopts[] = { static const struct option my_longopts[] = {
{"force", no_argument, 0, 'f'}, {"force", no_argument, 0, 'f'},
@ -75,28 +76,34 @@ int main(int argc, char *argv[])
my_args.progname, my_args.quiet, my_args.lxcpath[0])) my_args.progname, my_args.quiet, my_args.lxcpath[0]))
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
lxc_log_options_no_override(); lxc_log_options_no_override();
if (my_args.quiet)
quiet = true;
c = lxc_container_new(my_args.name, my_args.lxcpath[0]); c = lxc_container_new(my_args.name, my_args.lxcpath[0]);
if (!c) { if (!c) {
fprintf(stderr, "System error loading container\n"); if (!quiet)
fprintf(stderr, "System error loading container\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (!c->may_control(c)) { if (!c->may_control(c)) {
fprintf(stderr, "Insufficent privileges to control %s\n", my_args.name); if (!quiet)
fprintf(stderr, "Insufficent privileges to control %s\n", my_args.name);
lxc_container_put(c); lxc_container_put(c);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (!c->is_defined(c)) { if (!c->is_defined(c)) {
fprintf(stderr, "Container is not defined\n"); if (!quiet)
fprintf(stderr, "Container is not defined\n");
lxc_container_put(c); lxc_container_put(c);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (c->is_running(c)) { if (c->is_running(c)) {
if (!my_args.force) { if (!my_args.force) {
fprintf(stderr, "%s is running\n", my_args.name); if (!quiet)
fprintf(stderr, "%s is running\n", my_args.name);
lxc_container_put(c); lxc_container_put(c);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -128,11 +135,13 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
static int do_destroy(struct lxc_container *c) static int do_destroy(struct lxc_container *c)
{ {
if (!c->destroy(c)) { if (!c->destroy(c)) {
fprintf(stderr, "Destroying %s failed\n", my_args.name); if (!quiet)
fprintf(stderr, "Destroying %s failed\n", my_args.name);
return -1; return -1;
} }
printf("Destroyed container %s\n", my_args.name); if (!quiet)
printf("Destroyed container %s\n", my_args.name);
return 0; return 0;
} }
@ -190,7 +199,8 @@ static int do_destroy_with_snapshots(struct lxc_container *c)
continue; continue;
} }
if (!c1->destroy(c1)) { if (!c1->destroy(c1)) {
fprintf(stderr, "Destroying snapshot %s of %s failed\n", lxcname, my_args.name); if (!quiet)
fprintf(stderr, "Destroying snapshot %s of %s failed\n", lxcname, my_args.name);
lxc_container_put(c1); lxc_container_put(c1);
free(buf); free(buf);
return -1; return -1;
@ -212,11 +222,13 @@ static int do_destroy_with_snapshots(struct lxc_container *c)
bret = c->destroy(c); bret = c->destroy(c);
if (!bret) { if (!bret) {
fprintf(stderr, "Destroying %s failed\n", my_args.name); if (!quiet)
fprintf(stderr, "Destroying %s failed\n", my_args.name);
return -1; return -1;
} }
printf("Destroyed container %s including snapshots \n", my_args.name); if (!quiet)
printf("Destroyed container %s including snapshots \n", my_args.name);
return 0; return 0;
} }