summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/bindings/containers/containers.go6
-rw-r--r--pkg/specgen/namespaces.go3
2 files changed, 6 insertions, 3 deletions
diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go
index 74f6ded45..1ed4919e0 100644
--- a/pkg/bindings/containers/containers.go
+++ b/pkg/bindings/containers/containers.go
@@ -11,12 +11,12 @@ import (
"os/signal"
"strconv"
"strings"
- "syscall"
"github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/api/handlers"
"github.com/containers/libpod/pkg/bindings"
"github.com/containers/libpod/pkg/domain/entities"
+ sig "github.com/containers/libpod/pkg/signal"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh/terminal"
@@ -397,13 +397,13 @@ func Attach(ctx context.Context, nameOrId string, detachKeys *string, logs, stre
}()
winChange := make(chan os.Signal, 1)
- signal.Notify(winChange, syscall.SIGWINCH)
+ signal.Notify(winChange, sig.SIGWINCH)
winCtx, winCancel := context.WithCancel(ctx)
defer winCancel()
go func() {
// Prime the pump, we need one reset to ensure everything is ready
- winChange <- syscall.SIGWINCH
+ winChange <- sig.SIGWINCH
for {
select {
case <-winCtx.Done():
diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go
index 11dee1986..da1f8e8fc 100644
--- a/pkg/specgen/namespaces.go
+++ b/pkg/specgen/namespaces.go
@@ -40,6 +40,9 @@ const (
KeepID NamespaceMode = "keep-id"
// KeepId indicates to automatically create a user namespace
Auto NamespaceMode = "auto"
+ // DefaultKernelNamespaces is a comma-separated list of default kernel
+ // namespaces.
+ DefaultKernelNamespaces = "cgroup,ipc,net,uts"
)
// Namespace describes the namespace