From 498d006225b706d03389a6238b5bb0f2f30d80de Mon Sep 17 00:00:00 2001
From: Bernhard Ehlers <be@bernhard-ehlers.de>
Date: Wed, 30 Mar 2016 08:29:10 +0000
Subject: [PATCH] Minor cleanup on docker-init

---
 gns3server/modules/docker/docker_vm.py          | 2 ++
 gns3server/modules/docker/resources/bin/udhcpc  | 3 ---
 gns3server/modules/docker/resources/bin/udhcpc6 | 3 ---
 gns3server/modules/docker/resources/init.sh     | 6 ++----
 4 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100755 gns3server/modules/docker/resources/bin/udhcpc
 delete mode 100755 gns3server/modules/docker/resources/bin/udhcpc6

diff --git a/gns3server/modules/docker/docker_vm.py b/gns3server/modules/docker/docker_vm.py
index b143b171..c9ef0736 100644
--- a/gns3server/modules/docker/docker_vm.py
+++ b/gns3server/modules/docker/docker_vm.py
@@ -181,6 +181,8 @@ class DockerVM(BaseVM):
         os.makedirs(path, exist_ok=True)
         os.makedirs(os.path.join(path, "if-up.d"), exist_ok=True)
         os.makedirs(os.path.join(path, "if-down.d"), exist_ok=True)
+        os.makedirs(os.path.join(path, "if-pre-up.d"), exist_ok=True)
+        os.makedirs(os.path.join(path, "if-post-down.d"), exist_ok=True)
 
         if not os.path.exists(os.path.join(path, "interfaces")):
             with open(os.path.join(path, "interfaces"), "w+") as f:
diff --git a/gns3server/modules/docker/resources/bin/udhcpc b/gns3server/modules/docker/resources/bin/udhcpc
deleted file mode 100755
index c9d2f2be..00000000
--- a/gns3server/modules/docker/resources/bin/udhcpc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/tmp/gns3/bin/sh
-
-exec busybox udhcpc -s /gns3/etc/udhcpc/default.script "$@"
diff --git a/gns3server/modules/docker/resources/bin/udhcpc6 b/gns3server/modules/docker/resources/bin/udhcpc6
deleted file mode 100755
index 3d49d801..00000000
--- a/gns3server/modules/docker/resources/bin/udhcpc6
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/tmp/gns3/bin/sh
-
-exec busybox udhcpc6 -s /gns3/etc/udhcpc/default.script "$@"
diff --git a/gns3server/modules/docker/resources/init.sh b/gns3server/modules/docker/resources/init.sh
index bdaa1c42..c3df5ca1 100755
--- a/gns3server/modules/docker/resources/init.sh
+++ b/gns3server/modules/docker/resources/init.sh
@@ -26,8 +26,6 @@ PATH=/gns3/bin:/tmp/gns3/bin
 if [ ! -d /tmp/gns3/bin ]; then
 	busybox mkdir -p /tmp/gns3/bin
 	/gns3/bin/busybox --install -s /tmp/gns3/bin
-	# remove commands already available in /gns3/bin
-	(cd /tmp/gns3/bin; rm -f `cd /gns3/bin; echo *`)
 fi
 
 # Wait 2 seconds to settle the network interfaces
@@ -47,12 +45,12 @@ __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