summaryrefslogtreecommitdiffstats
path: root/tools/lvm.c
diff options
context:
space:
mode:
authorAlasdair Kergon <agk@redhat.com>2002-05-08 12:26:45 +0000
committerAlasdair Kergon <agk@redhat.com>2002-05-08 12:26:45 +0000
commita07e27374d3526d5591ccef042184e594acd3032 (patch)
tree8889d014d2482bd93ed9f292eb0647b36234a692 /tools/lvm.c
parent8ac9aae78aa7db6073c834b62226fd165478a8d2 (diff)
downloadlvm2-a07e27374d3526d5591ccef042184e594acd3032.tar.gz
lvm2-a07e27374d3526d5591ccef042184e594acd3032.tar.xz
lvm2-a07e27374d3526d5591ccef042184e594acd3032.zip
Always call init_log() to initialise logging defaults.
Diffstat (limited to 'tools/lvm.c')
-rw-r--r--tools/lvm.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/lvm.c b/tools/lvm.c
index 58066007..f6434a1a 100644
--- a/tools/lvm.c
+++ b/tools/lvm.c
@@ -1111,16 +1111,14 @@ static int init(void)
return 0;
}
- if (stat(config_file, &info) != -1) {
- /* we've found a config file */
- if (!read_config(cmd->cf, config_file)) {
- log_error("Failed to load config file %s", config_file);
- return 0;
- }
-
- __init_log(cmd->cf);
+ if (stat(config_file, &info) != -1 &&
+ !read_config(cmd->cf, config_file)) {
+ log_error("Failed to load config file %s", config_file);
+ return 0;
}
+ __init_log(cmd->cf);
+
_default_settings.umask = find_config_int(cmd->cf->root,
"global/umask", '/',
DEFAULT_UMASK);