[Ovirt-devel] [PATCH node] Change ovirtbr references to breth.

[Darryl L. Pierce]

From: Perry Myers <pmyers at redhat.com>

This patch has a few small fixes to eliminate breth$eth.

Signed-off-by: Perry Myers <pmyers at redhat.com>
Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 scripts/ovirt-config-networking     |    4 ++--
 scripts/ovirt-early                 |    2 +-
 scripts/ovirt-install-node-stateful |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking
index d89c589..65a07de 100755
--- a/scripts/ovirt-config-networking
+++ b/scripts/ovirt-config-networking
@@ -30,7 +30,7 @@ function configure_interface
         PREFIX=$OVIRT_IP_PREFIX
     fi
 
-    local BRIDGE=ovirtbr$NIC
+    local BRIDGE=br$NIC
     local IF_FILENAME="$WORKDIR/augtool-$NIC"
     local BR_FILENAME="$WORKDIR/augtool-$BRIDGE"
 
@@ -208,7 +208,7 @@ function setup_menu
     fi
 
     # Add virtio NICs that were possibly not detected by hal
-    NICS="$NICS $(ifconfig -a | awk '/Ethernet/ {print $1}' | grep -v "^ovirtbr" | xargs)"
+    NICS="$NICS $(ifconfig -a | awk '/Ethernet/ {print $1}' | grep -v "^breth" | xargs)"
     NICS=$(echo $NICS | tr ' ' '\n' | sort -u | xargs)
 
     PS3="Please select an interface or configuration option: "
diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index b098ba1..4623d3b 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -61,7 +61,7 @@ configure_from_network() {
     # bridge each ethernet device in the system
     ETHDEVS=$(cd /sys/class/net && ls -d eth*)
     for eth in $ETHDEVS; do
-        BRIDGE=ovirtbr$eth
+        BRIDGE=br$eth
         log "Applying default configuration to $eth and $BRIDGE"
         printf '%s\n' "DEVICE=$eth" ONBOOT=yes "BRIDGE=$BRIDGE" \
             > /etc/sysconfig/network-scripts/ifcfg-$eth
diff --git a/scripts/ovirt-install-node-stateful b/scripts/ovirt-install-node-stateful
index 3ec1c29..1b2475d 100755
--- a/scripts/ovirt-install-node-stateful
+++ b/scripts/ovirt-install-node-stateful
@@ -84,12 +84,12 @@ backup_file /etc/krb5.conf
 ovirt_setup_libvirtd
 
 backup_file /etc/sysconfig/iptables
-# We open up anything coming from ovirtbr0 to this node, since it
+# We open up anything coming from breth0 to this node, since it
 # is only intended for demo purposes.  For reference, here are the
 # ports that need to be opened:
 # 7777:tcp (ovirt-listen-awake), 16509:tcp (libvirtd), 5900-6000:tcp (vnc),
 # 49152-49216:tcp (libvirt migration)
-lokkit -q -t ovirtbr0
+lokkit -q -t breth0
 
 service iptables restart
 
-- 
1.6.0.6