projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-vsctl: Print correct fail-mode
[openvswitch]
/
utilities
/
ovs-discover.c
diff --git
a/utilities/ovs-discover.c
b/utilities/ovs-discover.c
index 308c40531e2869f3498ec21677b46291592fdee7..3aa28fad88dd490c9ad583e2f98f8220cbf465e5 100644
(file)
--- a/
utilities/ovs-discover.c
+++ b/
utilities/ovs-discover.c
@@
-48,7
+48,7
@@
static int n_ifaces;
/* --accept-vconn: Regular expression specifying the class of controller vconns
* that we will accept during autodiscovery. */
/* --accept-vconn: Regular expression specifying the class of controller vconns
* that we will accept during autodiscovery. */
-static const char *accept_controller_re = ".*";
+static const char *accept_controller_re = "
tcp:
.*";
static regex_t accept_controller_regex;
/* --exit-without-bind: Exit after discovering the controller, without binding
static regex_t accept_controller_regex;
/* --exit-without-bind: Exit after discovering the controller, without binding
@@
-122,7
+122,6
@@
main(int argc, char *argv[])
signal(SIGPIPE, SIG_IGN);
for (;;) {
signal(SIGPIPE, SIG_IGN);
for (;;) {
- fatal_signal_block();
for (i = 0; i < n_ifaces; i++) {
struct iface *iface = &ifaces[i];
dhclient_run(iface->dhcp);
for (i = 0; i < n_ifaces; i++) {
struct iface *iface = &ifaces[i];
dhclient_run(iface->dhcp);
@@
-195,7
+194,6
@@
main(int argc, char *argv[])
dhclient_wait(iface->dhcp);
}
unixctl_server_wait(unixctl);
dhclient_wait(iface->dhcp);
}
unixctl_server_wait(unixctl);
- fatal_signal_unblock();
poll_block();
}
poll_block();
}