CLOUD-57217 do not create home directory and print out version by def…

…ault
hortonworks · Aug 26, 2016 · 57f4fdc · 57f4fdc
1 parent f777995
commit 57f4fdc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 BINARY=salt-bootstrap
 
-VERSION=0.2.2
+VERSION=0.3.0
 BUILD_TIME=$(shell date +%FT%T)
 LDFLAGS=-ldflags "-X github.com/sequenceiq/salt-bootstrap/saltboot.Version=${VERSION} -X github.com/sequenceiq/salt-bootstrap/saltboot.BuildTime=${BUILD_TIME}"
 

diff --git a/main.go b/main.go
@@ -24,5 +24,6 @@ func main() {
 	log.SetOutput(io.MultiWriter(os.Stdout, logFile))
 
 	log.Println("[main] Launch salt-bootstrap application")
+	log.Printf("[main] Version: %s-%s", saltboot.Version, saltboot.BuildTime)
 	saltboot.NewCloudbreakBootstrapWeb()
 }
diff --git a/saltboot/user.go b/saltboot/user.go
@@ -44,7 +44,7 @@ func CreateUser(saltMaster SaltMaster) (resp model.Response, err error) {
 		if err != nil {
 			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err
 		}
-		result, err = ExecCmd("adduser", "-G", "wheel", "-s", "/sbin/nologin", "--password", hash, SALT_USER)
+		result, err = ExecCmd("adduser", "--no-create-home", "-G", "wheel", "-s", "/sbin/nologin", "--password", hash, SALT_USER)
 
 		if err != nil {
 			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err