Merge branch 'master' into add-zypper-bootstrap-build-test-case

ahkumar · Sep 11, 2018 · 8586be2 · 8586be2
2 parents 6d25942 + 59f2c9f
commit 8586be2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/mlocal/frags/Makefile.stub b/mlocal/frags/Makefile.stub
@@ -85,7 +85,7 @@ $(go_OBJ): $(BUILDDIR)/vendors-done $(libruntime) $(BUILDDIR)/config.h
 $(bash_completion): $(go_OBJ)
 	@rm -f $@
 	@mkdir -p $(@D)
-	$(V)go run  $(SOURCEDIR)/etc/bash_completion.d/bash_completion.go $@
+	$(V)go run -tags "$(go_TAG)" $(SOURCEDIR)/etc/bash_completion.d/bash_completion.go $@
 
 # install singularity CLI bash_completion file
 $(bash_completion_INSTALL): $(bash_completion)

diff --git a/src/runtime/engines/singularity/prepare.go b/src/runtime/engines/singularity/prepare.go
@@ -43,6 +43,8 @@ func (e *EngineOperations) prepareUserCaps() error {
 	}
 
 	caps, _ := capabilities.Split(e.EngineConfig.GetAddCaps())
+	caps = append(caps, e.EngineConfig.OciConfig.Process.Capabilities.Permitted...)
+
 	authorizedCaps, _ := file.CheckUserCaps(pw.Name, caps)
 
 	if len(authorizedCaps) > 0 {