docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check for OS and root privileges in NewDaemon 

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
This commit is contained in:
Solomon Hykes 2014-07-30 06:37:12 +00:00
parent bbca4867f8
commit 419b9fe164
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/daemon.go
View File

@ -761,6 +761,12 @@ func NewDaemon(config *daemonconfig.Config, eng *engine.Engine) (*Daemon, error)
} }
func NewDaemonFromDirectory(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 { if !config.EnableSelinuxSupport {
selinuxSetDisabled() selinuxSetDisabled()
} }

7
docker/docker.go
View File

@ -114,13 +114,6 @@ func main() {
} }
if *flDaemon { 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 { if flag.NArg() != 0 {
flag.Usage() flag.Usage()
return return