summaryrefslogtreecommitdiff
path: root/vendor/github.com/projectatomic/buildah/run.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-07-02 10:25:18 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-07-02 20:39:16 +0000
commit767b3ddc433fd57f461fa9866e3e4d47399a6519 (patch)
tree9a6678f3b1fc5be90946e478ee4df1098026a8ba /vendor/github.com/projectatomic/buildah/run.go
parentd357703e061258a57854df1880e23775dbe717ef (diff)
downloadpodman-767b3ddc433fd57f461fa9866e3e4d47399a6519.tar.gz
podman-767b3ddc433fd57f461fa9866e3e4d47399a6519.tar.bz2
podman-767b3ddc433fd57f461fa9866e3e4d47399a6519.zip
vendor in selinux and buildah for darwin compilation
Signed-off-by: baude <bbaude@redhat.com> Closes: #1037 Approved by: baude
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/run.go')
-rw-r--r--vendor/github.com/projectatomic/buildah/run.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/projectatomic/buildah/run.go b/vendor/github.com/projectatomic/buildah/run.go
index 0efb79922..4c9f83acd 100644
--- a/vendor/github.com/projectatomic/buildah/run.go
+++ b/vendor/github.com/projectatomic/buildah/run.go
@@ -1145,9 +1145,9 @@ func runUsingRuntimeMain() {
os.Exit(1)
}
// Set ourselves up to read the container's exit status. We're doing this in a child process
- // so that we won't mess with the setting in a caller of the library.
- if err := unix.Prctl(unix.PR_SET_CHILD_SUBREAPER, uintptr(1), 0, 0, 0); err != nil {
- fmt.Fprintf(os.Stderr, "prctl(PR_SET_CHILD_SUBREAPER, 1): %v\n", err)
+ // so that we won't mess with the setting in a caller of the library. This stubs to OS specific
+ // calls
+ if err := setChildProcess(); err != nil {
os.Exit(1)
}
// Run the container, start to finish.
@@ -1323,7 +1323,7 @@ func runUsingRuntime(options RunOptions, configureNetwork bool, configureNetwork
}()
if configureNetwork {
- teardown, err := runConfigureNetwork(options, configureNetwork, configureNetworks, pid, containerName, spec.Process.Args)
+ teardown, err := runConfigureNetwork(options, configureNetworks, pid, containerName, spec.Process.Args)
if teardown != nil {
defer teardown()
}
@@ -1453,7 +1453,7 @@ func runCollectOutput(fds ...int) string {
return b.String()
}
-func runConfigureNetwork(options RunOptions, configureNetwork bool, configureNetworks []string, pid int, containerName string, command []string) (teardown func(), err error) {
+func runConfigureNetwork(options RunOptions, configureNetworks []string, pid int, containerName string, command []string) (teardown func(), err error) {
var netconf, undo []*libcni.NetworkConfigList
// Scan for CNI configuration files.
confdir := options.CNIConfigDir