host bridge interface

4 files changed, 27 insertions, 43 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
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 713c0a3d..162dcdc2 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -17,7 +17,7 @@ build() {
 	pinfo "Searching binaries from config file in system..."
 	for BIN in ${REQUIRED_BINARIES}
 	do
-		BIN_LOCATION=$(which ${BIN})
+		BIN_LOCATION="$(which ${BIN})"
 		if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
 		then
 			get_link_chain ${BIN_LOCATION} >> "${FILELIST}"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index ced39207..0efbe5e8 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -1,6 +1,7 @@
 REQUIRED_MODULES="	kernel"
-REQUIRED_INSTALLED_PACKAGES="nfs-common aufs-tools squashfs-tools whois xfsprogs"
-REQUIRED_BINARIES="	bash
+REQUIRED_INSTALLED_PACKAGES="nfs-common squashfs-tools whois xfsprogs"
+REQUIRED_BINARIES="
+			bash
 			more
 			less
 			agetty
@@ -14,7 +15,6 @@ REQUIRED_BINARIES="	bash
 			umount
 			mount.nfs4
 			umount.nfs4
-			mount.aufs
 			fdisk
 			mkfs.xfs
 			rm
@@ -25,12 +25,16 @@ REQUIRED_BINARIES="	bash
 			ssh
 			tput
 			xterm
-			ckbcomp
 			xvidtune
 			bc
 			dirname
 			mkdosfs
+<<<<<<< HEAD
 			amixer"
+=======
+			iptables
+"
+>>>>>>> e3ecae28eff31fe097cb479ae981e9739cfb15e9
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index 2fd5af1a..4d44e2d6 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -1,35 +1,6 @@
-pinfo "If aufs install fails, run zypper addrepo http://jftp.inai.de/openSUSE_12.3/ j.eng-i586"
 REQUIRED_MODULES="	kernel"
-REQUIRED_INSTALLED_PACKAGES="nfs-client aufs squashfs"
+REQUIRED_INSTALLED_PACKAGES="nfs-client xfsprogs squashfs timezone"
 REQUIRED_CONTENT_PACKAGES="timezone"
-REQUIRED_BINARIES="	bash
-			agetty
-			cat
-			false
-			loadkeys
-			setfont
-			login
-			sulogin
-			mount
-			umount
-			mount.nfs4
-			umount.nfs4
-			mount.aufs
-			rm
-			ldd
-			strace
-			blkid
-			more
-			modprobe
-			rsyslogd
-			ps
-			scp
-			ssh
-			tput
-			xterm
-			xvidtune
-			bc
-			dirname"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err