projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CA-37154: vswitch: Use MAC address of tagged PIF for VLAN fake-bridge
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index a7b43f7b4f34535e3ce429e0f416bb579c8e5a20..28491fc6c17f5a9d6261e6b4bf4672c09c4a8ee0 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-81,7
+81,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();
mgmt_reconfigure();
mgmt_init();
bridge_init();
mgmt_reconfigure();
@@
-222,6
+225,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) {