From 401680e85bcb059bdaa5b8dee86df2c968e021c3 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Mon, 11 Nov 2013 16:03:38 +0400 Subject: [PATCH] crtools: init logfile after processing all command line arguments I see no need now to init log during processing of command line arguments. Signed-off-by: Ruslan Kuprieiev Acked-by: Andrew Vagin Signed-off-by: Pavel Emelyanov --- crtools.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/crtools.c b/crtools.c index 60fd2e87d..0e592d8a6 100644 --- a/crtools.c +++ b/crtools.c @@ -77,7 +77,6 @@ int main(int argc, char *argv[]) pid_t pid = 0, tree_id = 0; int ret = -1; int opt, idx; - int log_inited = 0; int log_level = 0; BUILD_BUG_ON(PAGE_SIZE != PAGE_IMAGE_SIZE); @@ -171,9 +170,6 @@ int main(int argc, char *argv[]) break; case 'o': opts.output = optarg; - if (log_init(optarg)) - return -1; - log_inited = 1; break; case 'n': if (parse_ns_string(optarg)) @@ -286,11 +282,8 @@ int main(int argc, char *argv[]) log_set_loglevel(log_level); - if (!log_inited) { - ret = log_init(NULL); - if (ret) - return ret; - } + if (log_init(opts.output)) + return -1; if (opts.img_parent) pr_info("Will do snapshot from %s\n", opts.img_parent);