Follow a change in upstream

moby/moby#21625
ailispaw · Mar 31, 2016 · 5609c40 · 5609c40
1 parent 2594d42
commit 5609c40
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/overlay/etc/init.d/docker b/overlay/etc/init.d/docker
@@ -161,6 +161,10 @@ switch() {
     if [ -d "${DOCKER_BIN_DIR}/usr/local/bin" ]; then
       mv -f "${DOCKER_BIN_DIR}/usr/local/bin"/* "${DOCKER_BIN_DIR}"
       rm -rf "${DOCKER_BIN_DIR}/usr"
+    elif [ -d "${DOCKER_BIN_DIR}/docker" ]; then
+      mv -f "${DOCKER_BIN_DIR}/docker" "${DOCKER_BIN_DIR}/bin"
+      mv -f "${DOCKER_BIN_DIR}/bin"/* "${DOCKER_BIN_DIR}"
+      rm -rf "${DOCKER_BIN_DIR}/bin"
     fi
     if [ ! -f "${DOCKER_BIN_DIR}/${DOCKER_DAEMON}" ]; then
       echo " not found."