@@ -195,7 +195,7 @@ m4_define([_OVS_VSWITCHD_START],
# 'vswitchd-aux-args' provides a way to pass extra command line arguments
# to ovs-vswitchd
m4_define([OVS_VSWITCHD_START],
- [_OVS_VSWITCHD_START([--enable-dummy$3 --disable-system $4])
+ [_OVS_VSWITCHD_START([--enable-dummy$3 --disable-system --disable-system-route $4])
AT_CHECK([add_of_br 0 $1 m4_if([$2], [], [], [| uuidfilt])], [0], [$2])
])
@@ -36,7 +36,9 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START],
m4_define([OVS_TRAFFIC_VSWITCHD_STOP],
[OVS_VSWITCHD_STOP([dnl
$1";/netdev_linux.*obtaining netdev stats via vport failed/d
-/dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d"])
+/dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
+/dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
+/dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d"])
AT_CHECK([:; $2])
])
@@ -161,6 +161,7 @@ parse_options(int argc, char *argv[], char **unixctl_pathp)
OPT_BOOTSTRAP_CA_CERT,
OPT_ENABLE_DUMMY,
OPT_DISABLE_SYSTEM,
+ OPT_DISABLE_SYSTEM_ROUTE,
DAEMON_OPTION_ENUMS,
OPT_DPDK,
SSL_OPTION_ENUMS,
@@ -178,6 +179,7 @@ parse_options(int argc, char *argv[], char **unixctl_pathp)
{"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
{"enable-dummy", optional_argument, NULL, OPT_ENABLE_DUMMY},
{"disable-system", no_argument, NULL, OPT_DISABLE_SYSTEM},
+ {"disable-system-route", no_argument, NULL, OPT_DISABLE_SYSTEM_ROUTE},
{"dpdk", optional_argument, NULL, OPT_DPDK},
{"dummy-numa", required_argument, NULL, OPT_DUMMY_NUMA},
{NULL, 0, NULL, 0},
@@ -227,6 +229,9 @@ parse_options(int argc, char *argv[], char **unixctl_pathp)
case OPT_DISABLE_SYSTEM:
dp_blacklist_provider("system");
+ break;
+
+ case OPT_DISABLE_SYSTEM_ROUTE:
ovs_router_disable_system_routing_table();
break;