Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 1 Mar 2014 15:59:32 +0000 (16:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 1 Mar 2014 15:59:32 +0000 (16:59 +0100)
src/initscripts/init.d/networking/red

index 28df551038efaa9dae66e6cae0f1b8f5a7f87a81..b09737e39526a8e041fe975818283873f97ee777 100644 (file)
@@ -175,6 +175,14 @@ case "${1}" in
                                boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
                                br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
                                sleep 1
+
+                               # use user-defined or green mac address for nas0
+                               if [ -n "$MAC" ]; then
+                                       ip link set dev nas0 address ${MAC}
+                               else
+                                       ip link set dev nas0 address $(cat /sys/class/net/green0/address)
+                               fi
+
                                if [ "$TYPE" == "pppoeatm" ]; then
                                        TYPE="pppoe"
                                fi