-m4_define([OVS_KMOD_VSWITCHD_START],
- [ AT_CHECK([modprobe openvswitch])
- ON_EXIT([modprobe -r openvswitch])
+# Best-effort loading of all available vport modules is performed.
+#
+m4_define([OVS_TRAFFIC_VSWITCHD_START],
+ [AT_CHECK([modprobe openvswitch])
+ on_exit 'modprobe -r openvswitch'
+ m4_foreach([mod], [[vport_geneve], [vport_gre], [vport_lisp], [vport_stt], [vport_vxlan]],
+ [modprobe -q mod || echo "Module mod not loaded."
+ on_exit 'modprobe -q -r mod'])
+ on_exit 'ovs-dpctl del-dp ovs-system'