From fa5223dab5b9f5cef2a0a341ee5065fec9c6d663 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Tue, 8 Apr 2014 11:59:02 -0700
Subject: [PATCH 1/2] Added Fedora installation method

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
---
 hack/install.sh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/hack/install.sh b/hack/install.sh
index 205b57ecc7..575f328292 100755
--- a/hack/install.sh
+++ b/hack/install.sh
@@ -72,8 +72,35 @@ fi
 if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then
 	lsb_dist='Debian'
 fi
+if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then
+	lsb_dist='Fedora'
+fi
 
 case "$lsb_dist" in
+	Fedora)
+		(
+			set -x
+			$sh_c 'sleep 3; yum -y -q install docker-io'
+		)
+		if command_exists docker && [ -e /var/run/docker.sock ]; then
+			(
+				set -x
+				$sh_c 'docker run busybox echo "Docker has been successfully installed!"'
+			) || true
+		fi
+		your_user=your-user
+		[ "$user" != 'root' ] && your_user="$user"
+		echo
+		echo 'If you would like to use Docker as a non-root user, you should now consider'
+		echo 'adding your user to the "docker" group with something like:'
+		echo
+		echo '  sudo usermod -aG docker' $your_user
+		echo
+		echo 'Remember that you will have to log out and back in for this to take effect!'
+		echo
+		exit 0
+		;;
+
 	Ubuntu|Debian)
 		export DEBIAN_FRONTEND=noninteractive
 		

From a2aa902ec194169431fea6784c4a7cdab25aaf24 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Tue, 8 Apr 2014 11:59:36 -0700
Subject: [PATCH 2/2] Removed extra whitespace

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
---
 hack/install.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/hack/install.sh b/hack/install.sh
index 575f328292..43248cf2c0 100755
--- a/hack/install.sh
+++ b/hack/install.sh
@@ -103,7 +103,7 @@ case "$lsb_dist" in
 
 	Ubuntu|Debian)
 		export DEBIAN_FRONTEND=noninteractive
-		
+
 		did_apt_get_update=
 		apt_get_update() {
 			if [ -z "$did_apt_get_update" ]; then
@@ -111,21 +111,21 @@ case "$lsb_dist" in
 				did_apt_get_update=1
 			fi
 		}
-		
+
 		# aufs is preferred over devicemapper; try to ensure the driver is available.
 		if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
 			kern_extras="linux-image-extra-$(uname -r)"
-			
+
 			apt_get_update
 			( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true
-			
+
 			if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
 				echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)'
 				echo >&2 ' but we still have no AUFS.  Docker may not work. Proceeding anyways!'
 				( set -x; sleep 10 )
 			fi
 		fi
-		
+
 		if [ ! -e /usr/lib/apt/methods/https ]; then
 			apt_get_update
 			( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https' )
@@ -165,7 +165,7 @@ case "$lsb_dist" in
 		echo
 		exit 0
 		;;
-		
+
 	Gentoo)
 		if [ "$url" = "https://test.docker.io/" ]; then
 			echo >&2
@@ -180,7 +180,7 @@ case "$lsb_dist" in
 			echo >&2
 			exit 1
 		fi
-		
+
 		(
 			set -x
 			$sh_c 'sleep 3; emerge app-emulation/docker'