rhel: Space separated list of DHCP interfaces in network scripts.
authorGurucharan Shetty <gshetty@nicira.com>
Fri, 3 Feb 2012 20:21:30 +0000 (12:21 -0800)
committerGurucharan Shetty <gshetty@nicira.com>
Fri, 3 Feb 2012 21:50:19 +0000 (13:50 -0800)
Use space separated list of DHCP interfaces for OVSDHCPINTERFACES
instead of comma separated list. This is done to maintain
consistency with BOND_IFACES.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
rhel/README.RHEL
rhel/etc_sysconfig_network-scripts_ifup-ovs

index b97fb6c0336ac91e476d53bde8236f336811dd71..d9b68e4b31cd441b3044a61e9268c2f98e0fc1f2 100644 (file)
@@ -65,7 +65,7 @@ HOTPLUG=no
 Enable DHCP on the bridge:
 * Needs OVSBOOTPROTO instead of BOOTPROTO.
 * All the interfaces that can reach the DHCP server
-as a comma separated list in OVSDHCPINTERFACES.
+as a space separated list in OVSDHCPINTERFACES.
 
 DEVICE=ovsbridge0
 ONBOOT=yes
index 4773ee4270fa16d53518cb5f2cffd925134d9472..b800ce050893d12a26566579f5d3f193d3baccbb 100755 (executable)
@@ -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"