projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add OXM data to mf_fields
[openvswitch]
/
rhel
/
etc_sysconfig_network-scripts_ifup-ovs
diff --git
a/rhel/etc_sysconfig_network-scripts_ifup-ovs
b/rhel/etc_sysconfig_network-scripts_ifup-ovs
index 18cebc4ddcab21ad5db6a561f157faea4507b8dd..b800ce050893d12a26566579f5d3f193d3baccbb 100755
(executable)
--- a/
rhel/etc_sysconfig_network-scripts_ifup-ovs
+++ b/
rhel/etc_sysconfig_network-scripts_ifup-ovs
@@
-37,11
+37,8
@@
case "$TYPE" in
OVSBridge)
ovs-vsctl -- --may-exist add-br "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
if [ "${OVSBOOTPROTO}" = "dhcp" ] && [ -n "${OVSINTF}" ]; then
OVSBridge)
ovs-vsctl -- --may-exist add-br "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
if [ "${OVSBOOTPROTO}" = "dhcp" ] && [ -n "${OVSINTF}" ]; then
- case ${OVSDHCPINTERFACES} in
- ${OVSINTF#ifcfg-} | \
- "${OVSINTF#ifcfg-},"* | \
- *",${OVSINTF#ifcfg-}" | \
- *",${OVSINTF#ifcfg-},"*)
+ case " ${OVSDHCPINTERFACES} " in
+ *" ${OVSINTF} "*)
BOOTPROTO=dhcp ${OTHERSCRIPT} ${CONFIG}
;;
esac
BOOTPROTO=dhcp ${OTHERSCRIPT} ${CONFIG}
;;
esac
@@
-54,7
+51,7
@@
case "$TYPE" in
/sbin/ifup "$OVS_BRIDGE"
${OTHERSCRIPT} ${CONFIG} ${2}
ovs-vsctl -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
/sbin/ifup "$OVS_BRIDGE"
${OTHERSCRIPT} ${CONFIG} ${2}
ovs-vsctl -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
- OVSINTF=${
CONFIG
} /sbin/ifup "$OVS_BRIDGE"
+ OVSINTF=${
DEVICE
} /sbin/ifup "$OVS_BRIDGE"
;;
OVSIntPort)
/sbin/ifup "$OVS_BRIDGE"
;;
OVSIntPort)
/sbin/ifup "$OVS_BRIDGE"
@@
-68,7
+65,7
@@
case "$TYPE" in
done
ovs-vsctl -- --fake-iface add-bond "$OVS_BRIDGE" "$DEVICE" ${BOND_IFACES} $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
${OTHERSCRIPT} ${CONFIG} ${2}
done
ovs-vsctl -- --fake-iface add-bond "$OVS_BRIDGE" "$DEVICE" ${BOND_IFACES} $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
${OTHERSCRIPT} ${CONFIG} ${2}
- OVSINTF=${
CONFIG
} /sbin/ifup "$OVS_BRIDGE"
+ OVSINTF=${
DEVICE
} /sbin/ifup "$OVS_BRIDGE"
;;
*)
echo $"Invalid OVS interface type $TYPE"
;;
*)
echo $"Invalid OVS interface type $TYPE"