prebacio interface upping u specificnu konfiguraciju, plus provjera s getIfcOperState...

diff --git a/linux/quagga.tcl b/linux/quagga.tcl
index 25fbd3034d1019f60dbda6691f5f48d6e851c299..d399eb49eb328bfbb85a6e578c4165e139c06b8f 100755 (executable)
--- a/linux/quagga.tcl
+++ b/linux/quagga.tcl
@@ -242,6 +242,13 @@ proc $MODULE.start { eid node } {
 
     l3node.start $eid $node
 
+    # FIXME: Quagga unatoc svemu ne moze sama podici sucelja, pa moramo rucno
+    foreach ifc [ifcList $node] {
+       if { [getIfcOperState $node $ifc] == "up" } {
+                       nexec vzctl exec $node_id ip link set up dev $ifc
+               }
+    }
+
     upvar 0 ::cf::[set ::curcfg]::[set node]::node_id node_id
     nexec vzctl exec $node_id sysctl -w net/ipv4/ip_forward=1
     

diff --git a/quaggaboot.sh b/quaggaboot.sh
index 5ace1dc19da1291e16e22b1ad204a3114462d14e..72fb93f3238c98375a86deefc04cb27f50ab41c8 100755 (executable)
--- a/quaggaboot.sh
+++ b/quaggaboot.sh
@@ -1,16 +1,5 @@
 #!/bin/sh
 
-# UGLY hack jer Quagga nezna sama podici interface
-# pohvata sva sucelja
-IFACES=`ip a | grep "<BROADCAST,MULTICAST>" | awk '{ print $2}' | cut -c1-4`
-
-# i sve ih proba podici
-for iface in $IFACES; do
-    ip link set up dev $iface
-    echo "Setting INTERFACE=$iface to UP"
-done
-
-
 export PATH=$PATH:/usr/lib/quagga
 
 zebra -dP0