From e58085b207607a75442d03b4c1f8ec63ece6823c Mon Sep 17 00:00:00 2001
From: Bill Peck <bpeck@redhat.com>
Date: Wed, 23 Jan 2013 09:52:27 -0500
Subject: fixes for both add_interface commands

---
 kernel/networking/add_interface/runtest.sh | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'kernel/networking/add_interface')

diff --git a/kernel/networking/add_interface/runtest.sh b/kernel/networking/add_interface/runtest.sh
index edd236d..1060058 100755
--- a/kernel/networking/add_interface/runtest.sh
+++ b/kernel/networking/add_interface/runtest.sh
@@ -29,24 +29,11 @@
 # Include Beaker environment
 . /usr/bin/rhts-environment.sh || exit 1
 
-add_interface()
-{
-    local intf=$1
-    local ipaddr=$2
-    local ip=$(echo $ipaddr | sed -e 's/\/.*//')
-    local netmask=$(ipcalc -m $ipaddr)
-    cat << EOF > /etc/sysconfig/network-scripts/ifcfg-$intf
-DEVICE=$intf
-ONBOOT=yes
-TYPE="Ethernet"
-HOTPLUG=no
-IPADDR=$ip
-$netmask
-EOF
-}
-
 for intf in $INTERFACES; do
-    ipaddr=$(eval echo \$$intf)
-    add_interface $intf $ipaddr && report_result $TEST/$intf PASS 0 || report_result $TEST/$intf FAIL 1
+    > /etc/sysconfig/network-scripts/ifcfg-$intf
+    for entry in $(eval echo \$$intf); do
+        echo $entry >> /etc/sysconfig/network-scripts/ifcfg-$intf
+    done
+    cat /etc/sysconfig/network-scripts/ifcfg-$intf
 done
 service network restart && report_result $TEST/restart_network PASS 0 || report_result $TEST/restart_network FAIL 1
-- 
cgit