From 83784989514ca010bf6c292b01482e0baa14ff85 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Thu, 2 May 2013 12:32:10 -0700
Subject: [PATCH] Fix issue within mergeConfig preventing hostname and user to
 be set

---
 runtime.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime.go b/runtime.go
index 16c98117fd..7ad0c395e8 100644
--- a/runtime.go
+++ b/runtime.go
@@ -80,10 +80,10 @@ func (runtime *Runtime) containerRoot(id string) string {
 }
 
 func (runtime *Runtime) mergeConfig(userConf, imageConf *Config) {
-	if userConf.Hostname != "" {
+	if userConf.Hostname == "" {
 		userConf.Hostname = imageConf.Hostname
 	}
-	if userConf.User != "" {
+	if userConf.User == "" {
 		userConf.User = imageConf.User
 	}
 	if userConf.Memory == 0 {