Merge branch 'master' into begin-releases

gluster · Sep 22, 2016 · 5559375 · 5559375
2 parents 20cf545 + 0010123
commit 5559375
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -22,9 +22,11 @@ glusterd2:
 	@GO15VENDOREXPERIMENT=1 go build -ldflags $(LDFLAGS)
 	@echo
 
-install:
+install: check vendor-update
 	@echo Building and installing GlusterD-2.0
 	@GO15VENDOREXPERIMENT=1 go install -ldflags $(LDFLAGS)
+	@echo Setting CAP_SYS_ADMIN for glusterd2 \(requires sudo\)
+	sudo setcap cap_sys_admin+ep $$GOPATH/bin/glusterd2
 	@echo
 
 vendor-update: