From: 2xsec Date: Thu, 28 Jun 2018 14:00:03 +0000 (+0900) Subject: tools: lxc-freeze: share internal API symbols X-Git-Tag: lxc-3.1.0~225^2~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a599e9c04357b8d3c1bc06c65e026a383183932d;p=thirdparty%2Flxc.git tools: lxc-freeze: share internal API symbols Signed-off-by: 2xsec --- diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index acdb29dc4..4afb3f0c7 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -273,7 +273,7 @@ lxc_console_SOURCES = tools/lxc_console.c tools/arguments.c tools/tool_utils.c lxc_destroy_SOURCES = tools/lxc_destroy.c tools/arguments.c tools/tool_utils.c lxc_device_SOURCES = tools/lxc_device.c tools/arguments.c tools/tool_utils.c lxc_execute_SOURCES = tools/lxc_execute.c tools/arguments.c tools/tool_utils.c -lxc_freeze_SOURCES = tools/lxc_freeze.c tools/arguments.c tools/tool_utils.c +lxc_freeze_SOURCES = tools/lxc_freeze.c tools/arguments.c lxc_info_SOURCES = tools/lxc_info.c tools/arguments.c tools/tool_utils.c lxc_monitor_SOURCES = tools/lxc_monitor.c tools/arguments.c tools/tool_utils.c lxc_ls_SOURCES = tools/lxc_ls.c tools/arguments.c tools/tool_utils.c diff --git a/src/lxc/tools/lxc_freeze.c b/src/lxc/tools/lxc_freeze.c index 19e758c6f..88e1f38b8 100644 --- a/src/lxc/tools/lxc_freeze.c +++ b/src/lxc/tools/lxc_freeze.c @@ -32,6 +32,9 @@ #include #include "arguments.h" +#include "log.h" + +lxc_log_define(lxc_freeze, lxc); static const struct option my_longopts[] = { LXC_COMMON_OPTIONS @@ -75,33 +78,35 @@ int main(int argc, char *argv[]) c = lxc_container_new(my_args.name, my_args.lxcpath[0]); if (!c) { - lxc_error(&my_args, "No such container: %s:%s", my_args.lxcpath[0], my_args.name); + ERROR("No such container: %s:%s", my_args.lxcpath[0], my_args.name); exit(EXIT_FAILURE); } if (my_args.rcfile) { c->clear_config(c); + if (!c->load_config(c, my_args.rcfile)) { - lxc_error(&my_args, "Failed to load rcfile"); + ERROR("Failed to load rcfile"); lxc_container_put(c); exit(EXIT_FAILURE); } + c->configfile = strdup(my_args.rcfile); if (!c->configfile) { - lxc_error(&my_args, "Out of memory setting new config filename"); + ERROR("Out of memory setting new config filename"); lxc_container_put(c); exit(EXIT_FAILURE); } } if (!c->may_control(c)) { - lxc_error(&my_args, "Insufficent privileges to control %s:%s", my_args.lxcpath[0], my_args.name); + ERROR("Insufficent privileges to control %s:%s", my_args.lxcpath[0], my_args.name); lxc_container_put(c); exit(EXIT_FAILURE); } if (!c->freeze(c)) { - lxc_error(&my_args, "Failed to freeze %s:%s", my_args.lxcpath[0], my_args.name); + ERROR("Failed to freeze %s:%s", my_args.lxcpath[0], my_args.name); lxc_container_put(c); exit(EXIT_FAILURE); }