From: Tom Clegg <tom@tomclegg.ca>
Date: Thu, 19 Mar 2020 20:29:50 +0000 (-0400)
Subject: 16053: Fix warnings when installer cwd is not readable by postgres.
X-Git-Tag: 2.1.0~259^2~15
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/1ea2920b1b525939868be927abe7a1512a690ef7

16053: Fix warnings when installer cwd is not readable by postgres.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

diff --git a/lib/install/deps.go b/lib/install/deps.go
index ffe0a85984..e0c3da5d25 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -303,10 +303,13 @@ ln -sf /var/lib/arvados/node-${NJS}-linux-x64/bin/{node,npm} /usr/local/bin/
 		}
 
 		withstuff := "WITH LOGIN SUPERUSER ENCRYPTED PASSWORD " + pq.QuoteLiteral(devtestDatabasePassword)
-		if err := exec.Command("sudo", "-u", "postgres", "psql", "-c", "ALTER ROLE arvados "+withstuff).Run(); err == nil {
+		cmd := exec.Command("sudo", "-u", "postgres", "psql", "-c", "ALTER ROLE arvados "+withstuff)
+		cmd.Dir = "/"
+		if err := cmd.Run(); err == nil {
 			logger.Print("arvados role exists; superuser privileges added, password updated")
 		} else {
 			cmd := exec.Command("sudo", "-u", "postgres", "psql", "-c", "CREATE ROLE arvados "+withstuff)
+			cmd.Dir = "/"
 			cmd.Stdout = stdout
 			cmd.Stderr = stderr
 			err = cmd.Run()