host bridge interface

1 files changed, 17 insertions, 8 deletions

diff --git a/remote/rootfs/rootfs-stage31/data/bin/setup_network b/remote/rootfs/rootfs-stage31/data/bin/setup_network
index 32c1d5ef..2578de4c 100755
--- a/remote/rootfs/rootfs-stage31/data/bin/setup_network
+++ b/remote/rootfs/rootfs-stage31/data/bin/setup_network
@@ -3,13 +3,24 @@
 echo "Mac address is '$MAC'"
 
 # setup network
-NWIF="eth0"
+
 # set up loopback networking
 echo "Setting up loopback"
 ip link set dev lo up 2>/dev/null
 ip addr add 127.0.0.1/8 dev lo 2>/dev/null
-echo "Setting up $NWIF"
-ip link set dev $NWIF up  2>/dev/null || { echo "No link for $NWIF, dropping to shell.."; setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'; }
+
+echo "Setting up bridge"
+local bridge=br0
+local brnwif=eth0
+local nwifmac=${MAC}
+
+# bridge 0 already defined or some other problem
+brctl addbr ${bridge}
+brctl stp ${bridge} 0
+brctl setfd ${bridge} 0.000000000001
+ip link set addr ${nwifmac} ${bridge} 
+ip link set dev ${brnwif} up 
+brctl addif ${bridge} ${brnwif}
 
 # analyze ip information from the kernel command line and put parts
 # of it into several variables
@@ -30,13 +41,11 @@ if [ -n "$IPINFO" ] ; then
         # we might have an idea of the dns server via preboot
         dns_srv=$(getip 5)
         [ -n "$dns_srv" ] && echo nameserver $dns_srv >/etc/resolv.conf;
-        echo -e "# ip configuration written by $0 script:\nclientip=$clientip\n\
-subnet_mask=$subnet_mask\ngateway=$gateway\nserverip=$serverip\n\
-broadcast_address=$broadcast_address" >>/etc/initramfs-setup
         # set static ip address
         ip addr add $clientip/$(ipcalc -s -p $clientip $subnet_mask|sed s/.*=//) \
-        broadcast $broadcast_address dev $NWIF 2>/dev/null
-        ip route add default via $gateway 2>/dev/null
+        broadcast $broadcast_address dev $bridge 
+	ip link set dev ${bridge} up
+        ip route add default via $gateway
 else
         NOIPYET="yes"
 fi