X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=rhel%2Fetc_sysconfig_network-scripts_ifup-ovs;h=b800ce050893d12a26566579f5d3f193d3baccbb;hb=491aa8847a05f3ab98e6e6bd2ac26e331c363b3d;hp=4773ee4270fa16d53518cb5f2cffd925134d9472;hpb=e31f6c5d1c26e9b86adb6449226b4f08f2c8d7a5;p=openvswitch diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs b/rhel/etc_sysconfig_network-scripts_ifup-ovs index 4773ee42..b800ce05 100755 --- a/rhel/etc_sysconfig_network-scripts_ifup-ovs +++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs @@ -37,8 +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 - case ,${OVSDHCPINTERFACES}, in - *,${OVSINTF#ifcfg-},*) + case " ${OVSDHCPINTERFACES} " in + *" ${OVSINTF} "*) BOOTPROTO=dhcp ${OTHERSCRIPT} ${CONFIG} ;; esac @@ -51,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} - OVSINTF=${CONFIG} /sbin/ifup "$OVS_BRIDGE" + OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE" ;; OVSIntPort) /sbin/ifup "$OVS_BRIDGE" @@ -65,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} - OVSINTF=${CONFIG} /sbin/ifup "$OVS_BRIDGE" + OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE" ;; *) echo $"Invalid OVS interface type $TYPE"