Commit 4a296c63 by AustinReichert

tools/lxc_copy: remove internal logging

parent 8a0a156e
...@@ -50,8 +50,6 @@ ...@@ -50,8 +50,6 @@
#include <../include/getsubopt.h> #include <../include/getsubopt.h>
#endif #endif
lxc_log_define(lxc_copy_ui, lxc);
enum mnttype { enum mnttype {
LXC_MNT_BIND, LXC_MNT_BIND,
LXC_MNT_AUFS, LXC_MNT_AUFS,
...@@ -394,8 +392,6 @@ static int do_clone(struct lxc_container *c, char *newname, char *newpath, ...@@ -394,8 +392,6 @@ static int do_clone(struct lxc_container *c, char *newname, char *newpath,
return -1; return -1;
} }
INFO("Created %s as %s of %s\n", newname, task ? "snapshot" : "copy", c->name);
lxc_container_put(clone); lxc_container_put(clone);
return 0; return 0;
...@@ -515,12 +511,10 @@ destroy_and_put: ...@@ -515,12 +511,10 @@ destroy_and_put:
static int do_clone_rename(struct lxc_container *c, char *newname) static int do_clone_rename(struct lxc_container *c, char *newname)
{ {
if (!c->rename(c, newname)) { if (!c->rename(c, newname)) {
ERROR("Error: Renaming container %s to %s failed\n", c->name, newname); fprintf(stderr, "Error: Renaming container %s to %s failed\n", c->name, newname);
return -1; return -1;
} }
INFO("Renamed container %s to %s\n", c->name, newname);
return 0; return 0;
} }
...@@ -679,7 +673,7 @@ static int parse_aufs_mnt(char *mntstring, enum mnttype type) ...@@ -679,7 +673,7 @@ static int parse_aufs_mnt(char *mntstring, enum mnttype type)
else if (len == 2) /* aufs=src:dest */ else if (len == 2) /* aufs=src:dest */
m->dest = construct_path(mntarray[1], false); m->dest = construct_path(mntarray[1], false);
else else
INFO("Excess elements in mount specification"); printf("Excess elements in mount specification\n");
if (!m->dest) if (!m->dest)
goto err; goto err;
...@@ -733,7 +727,7 @@ static int parse_bind_mnt(char *mntstring, enum mnttype type) ...@@ -733,7 +727,7 @@ static int parse_bind_mnt(char *mntstring, enum mnttype type)
m->dest = construct_path(mntarray[1], false); m->dest = construct_path(mntarray[1], false);
m->options = strdup(mntarray[2]); m->options = strdup(mntarray[2]);
} else { } else {
INFO("Excess elements in mount specification"); printf("Excess elements in mount specification\n");
} }
if (!m->dest) if (!m->dest)
...@@ -802,7 +796,7 @@ static int parse_ovl_mnt(char *mntstring, enum mnttype type) ...@@ -802,7 +796,7 @@ static int parse_ovl_mnt(char *mntstring, enum mnttype type)
else if (len == 2) /* overlay=src:dest */ else if (len == 2) /* overlay=src:dest */
m->dest = construct_path(mntarray[1], false); m->dest = construct_path(mntarray[1], false);
else else
INFO("Excess elements in mount specification"); printf("Excess elements in mount specification\n");
if (!m->dest) if (!m->dest)
goto err; goto err;
...@@ -863,7 +857,7 @@ static char *mount_tmpfs(const char *oldname, const char *newname, ...@@ -863,7 +857,7 @@ static char *mount_tmpfs(const char *oldname, const char *newname,
goto err_free; goto err_free;
if (fcntl(fd, F_SETFD, FD_CLOEXEC)) { if (fcntl(fd, F_SETFD, FD_CLOEXEC)) {
SYSERROR("Failed to set close-on-exec on file descriptor."); fprintf(stderr, "Failed to set close-on-exec on file descriptor.\n");
goto err_close; goto err_close;
} }
......
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