diff options
| author | Gurucharan Shetty <gshetty@nicira.com> | 2012-02-03 12:21:30 -0800 |
|---|---|---|
| committer | Gurucharan Shetty <gshetty@nicira.com> | 2012-02-03 13:50:19 -0800 |
| commit | b4b6a39ae688b88b2d17c0b47b105fed86f6c29d (patch) | |
| tree | 23094419e48a82f3e22d73da686638835c55e4c3 /rhel | |
| parent | 5177f525658bc1f98c37ae08e8f5d4100ff0d910 (diff) | |
rhel: Space separated list of DHCP interfaces in network scripts.
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>
Diffstat (limited to 'rhel')
| -rw-r--r-- | rhel/README.RHEL | 2 | ||||
| -rwxr-xr-x | rhel/etc_sysconfig_network-scripts_ifup-ovs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/rhel/README.RHEL b/rhel/README.RHEL index b97fb6c0..d9b68e4b 100644 --- a/rhel/README.RHEL +++ b/rhel/README.RHEL @@ -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 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" |