From e81d7132faf0e9e9e12b24733e1bdc452eb81525 Mon Sep 17 00:00:00 2001
From: jpetazzo <jerome.petazzoni@dotcloud.com>
Date: Thu, 14 Mar 2013 03:26:50 +0000
Subject: [PATCH] Update get.docker.io install script for single-binary

---
 install.sh => contrib/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename install.sh => contrib/install.sh (94%)
 mode change 100644 => 100755

diff --git a/install.sh b/contrib/install.sh
old mode 100644
new mode 100755
similarity index 94%
rename from install.sh
rename to contrib/install.sh
index 0cfba4ddc3..b0a998332e
--- a/install.sh
+++ b/contrib/install.sh
@@ -38,14 +38,14 @@ fi
 echo "Downloading docker binary and uncompressing into /usr/local/bin..."
 curl -s http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz |
 tar -C /usr/local/bin --strip-components=1 -zxf- \
-docker-master/docker docker-master/dockerd
+docker-master/docker
 
 if [ -f /etc/init/dockerd.conf ]
 then
   echo "Upstart script already exists."
 else
   echo "Creating /etc/init/dockerd.conf..."
-  echo "exec /usr/local/bin/dockerd" > /etc/init/dockerd.conf
+  echo "exec /usr/local/bin/docker -d" > /etc/init/dockerd.conf
 fi
 
 echo "Starting dockerd..."