projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for v0.90.6 release.
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index 8c87feab80ed7a1908c91872246e64d02cb9182b..01645adf9e27a71f33327bd77a7b20cc5acfa271 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-80,7
+80,10
@@
main(int argc, char *argv[])
}
unixctl_command_register("vswitchd/reload", reload);
}
unixctl_command_register("vswitchd/reload", reload);
- cfg_read();
+ retval = cfg_read();
+ if (retval) {
+ ovs_fatal(retval, "could not read config file");
+ }
mgmt_init();
bridge_init();
port_init();
mgmt_init();
bridge_init();
port_init();
@@
-219,6
+222,7
@@
parse_options(int argc, char *argv[])
"use --help for usage");
}
"use --help for usage");
}
+ cfg_init();
config_file = argv[0];
error = cfg_set_file(config_file);
if (error) {
config_file = argv[0];
error = cfg_set_file(config_file);
if (error) {