Merge branch '1.5' into 2.0

gns3server/hypervisor/docker/resources/init.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/gns3/bin/busybox sh
 #
 # Copyright (C) 2016 GNS3 Technologies Inc.
 #
@@ -19,6 +19,14 @@
 # This script is injected into the container and launch before
 # the start command of the container
 #
+OLD_PATH="$PATH"
+PATH=/gns3/bin:/tmp/gns3/bin
+
+# bootstrap busybox commands
+if [ ! -d /tmp/gns3/bin ]; then
+	busybox mkdir -p /tmp/gns3/bin
+	/gns3/bin/busybox --install -s /tmp/gns3/bin
+fi
 
 # Wait 2 seconds to settle the network interfaces
 sleep 2
@@ -37,10 +45,14 @@ __EOF__
 # configure loopback interface
 ip link set dev lo up
 
-# configure eth interfaces
+# activate eth interfaces
 sed -n 's/^ *\(eth[0-9]*\):.*/\1/p' < /proc/net/dev | while read dev; do
 	ip link set dev $dev up
 done
 
+# configure network interfaces
+ifup -a -f
+
 # continue normal docker startup
+PATH="$OLD_PATH"
 exec "$@"