From 190fbe906eb4a0f4fa3308d4c6d0d8befceb4784 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@docker.com>
Date: Wed, 30 Jul 2014 06:37:12 +0000
Subject: [PATCH] Check for OS and root privileges in NewDaemon

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 419b9fe16425c301855aab781e1386f7a227a09d
Component: engine
---
 components/engine/daemon/daemon.go | 6 ++++++
 components/engine/docker/docker.go | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/engine/daemon/daemon.go b/components/engine/daemon/daemon.go
index ecd515e8fd..0dc5470044 100644
--- a/components/engine/daemon/daemon.go
+++ b/components/engine/daemon/daemon.go
@@ -761,6 +761,12 @@ func NewDaemon(config *daemonconfig.Config, eng *engine.Engine) (*Daemon, error)
 }
 
 func NewDaemonFromDirectory(config *daemonconfig.Config, eng *engine.Engine) (*Daemon, error) {
+	if runtime.GOOS != "linux" {
+		log.Fatalf("The Docker daemon is only supported on linux")
+	}
+	if os.Geteuid() != 0 {
+		log.Fatalf("The Docker daemon needs to be run as root")
+	}
 	if !config.EnableSelinuxSupport {
 		selinuxSetDisabled()
 	}
diff --git a/components/engine/docker/docker.go b/components/engine/docker/docker.go
index 5ffa0e2e6f..5719d6bb2a 100644
--- a/components/engine/docker/docker.go
+++ b/components/engine/docker/docker.go
@@ -114,13 +114,6 @@ func main() {
 	}
 
 	if *flDaemon {
-		if runtime.GOOS != "linux" {
-			log.Fatalf("The Docker daemon is only supported on linux")
-		}
-		if os.Geteuid() != 0 {
-			log.Fatalf("The Docker daemon needs to be run as root")
-		}
-
 		if flag.NArg() != 0 {
 			flag.Usage()
 			return