smeserver-bridge-interface/contribs7/smeserver-bridge-interface-0.1-br_takes_eth_mac.patch

diff -Nur smeserver-bridge-interface-0.1/root/etc/rc.d/init.d/bridge smeserver-bridge-interface-0.1_mod/root/etc/rc.d/init.d/bridge
--- smeserver-bridge-interface-0.1/root/etc/rc.d/init.d/bridge  2012-06-19 21:26:27.785073175 +0200
+++ smeserver-bridge-interface-0.1_mod/root/etc/rc.d/init.d/bridge      2012-06-19 21:27:37.836885907 +0200
@@ -19,6 +19,7 @@
 # Define physical ethernet interface to be bridged
 # with TAP interface(s) above.
 ETH_IF=$(/sbin/e-smith/db configuration getprop bridge ethernetInterface)
+ETH_MAC=$(/sbin/e-smith/db configuration getprop InternalInterface HWAddress)
 ETH_IP=$(/sbin/e-smith/db configuration get LocalIP)
 ETH_MASK=$(/sbin/e-smith/db configuration getprop InternalInterface Netmask)
 
@@ -93,6 +94,8 @@
        # And add it to the bridge
        /usr/sbin/brctl addif $BRIDGE_IF $ETH_IF >/dev/null 2>&1
 
+       [ -n "$ETH_MAC" ] && /sbin/ifconfig $BRIDGE_IF hw ether $ETH_MAC
+
        # Now configure the LocalIP on the bridge interface
        /sbin/e-smith/db configuration setprop InternalInterface Name $BRIDGE_IF
        /sbin/ifconfig $BRIDGE_IF $ETH_IP netmask $ETH_MASK >/dev/null 2>&1
1	vip-ire	1.1	diff -Nur smeserver-bridge-interface-0.1/root/etc/rc.d/init.d/bridge smeserver-bridge-interface-0.1_mod/root/etc/rc.d/init.d/bridge
2			--- smeserver-bridge-interface-0.1/root/etc/rc.d/init.d/bridge 2012-06-19 21:26:27.785073175 +0200
3			+++ smeserver-bridge-interface-0.1_mod/root/etc/rc.d/init.d/bridge 2012-06-19 21:27:37.836885907 +0200
4			@@ -19,6 +19,7 @@
5			# Define physical ethernet interface to be bridged
6			# with TAP interface(s) above.
7			ETH_IF=$(/sbin/e-smith/db configuration getprop bridge ethernetInterface)
8			+ETH_MAC=$(/sbin/e-smith/db configuration getprop InternalInterface HWAddress)
9			ETH_IP=$(/sbin/e-smith/db configuration get LocalIP)
10			ETH_MASK=$(/sbin/e-smith/db configuration getprop InternalInterface Netmask)
11
12			@@ -93,6 +94,8 @@
13			# And add it to the bridge
14			/usr/sbin/brctl addif $BRIDGE_IF $ETH_IF >/dev/null 2>&1
15
16			+ [ -n "$ETH_MAC" ] && /sbin/ifconfig $BRIDGE_IF hw ether $ETH_MAC
17			+
18			# Now configure the LocalIP on the bridge interface
19			/sbin/e-smith/db configuration setprop InternalInterface Name $BRIDGE_IF
20			/sbin/ifconfig $BRIDGE_IF $ETH_IP netmask $ETH_MASK >/dev/null 2>&1