diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-05-30 15:25:57 +0200 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2022-06-14 16:12:10 -0400 |
| commit | e23dd66fa9cedc8f4cc35aeedfa74194b19e9c5b (patch) | |
| tree | b1d7778d450a276ac73dc2e8229e8767fcaa29a0 | |
| parent | da4027c6550898045d93ac61d1b8b3e990bf5c73 (diff) | |
| download | podman-e23dd66fa9cedc8f4cc35aeedfa74194b19e9c5b.tar.gz podman-e23dd66fa9cedc8f4cc35aeedfa74194b19e9c5b.tar.bz2 podman-e23dd66fa9cedc8f4cc35aeedfa74194b19e9c5b.zip | |
fix bad import path for cmd/podman/utils
Libpod or packages under /pkg should never import from /cmd/...
This will quickly result in import cycles and weird code paths.
Also there is no reason to use this special code we can just use
syscall.SIGHUB as SIGNAL.
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| -rw-r--r-- | cmd/podman/utils/signals_linux.go | 15 | ||||
| -rw-r--r-- | cmd/podman/utils/signals_windows.go | 15 | ||||
| -rw-r--r-- | pkg/domain/infra/runtime_libpod.go | 4 |
3 files changed, 2 insertions, 32 deletions
diff --git a/cmd/podman/utils/signals_linux.go b/cmd/podman/utils/signals_linux.go deleted file mode 100644 index dd0507c0e..000000000 --- a/cmd/podman/utils/signals_linux.go +++ /dev/null @@ -1,15 +0,0 @@ -//go:build !windows -// +build !windows - -package utils - -import ( - "os" - - "golang.org/x/sys/unix" -) - -// Platform specific signal synonyms -var ( - SIGHUP os.Signal = unix.SIGHUP -) diff --git a/cmd/podman/utils/signals_windows.go b/cmd/podman/utils/signals_windows.go deleted file mode 100644 index e6fcc1b32..000000000 --- a/cmd/podman/utils/signals_windows.go +++ /dev/null @@ -1,15 +0,0 @@ -//go:build windows -// +build windows - -package utils - -import ( - "os" - - "golang.org/x/sys/windows" -) - -// Platform specific signal synonyms -var ( - SIGHUP os.Signal = windows.SIGHUP -) diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index ac557e9de..daa6f0cbf 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -9,9 +9,9 @@ import ( "os" "os/signal" "sync" + "syscall" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v4/cmd/podman/utils" "github.com/containers/podman/v4/libpod" "github.com/containers/podman/v4/pkg/domain/entities" "github.com/containers/podman/v4/pkg/namespaces" @@ -375,7 +375,7 @@ func ParseIDMapping(mode namespaces.UsernsMode, uidMapSlice, gidMapSlice []strin func StartWatcher(rt *libpod.Runtime) { // Setup the signal notifier ch := make(chan os.Signal, 1) - signal.Notify(ch, utils.SIGHUP) + signal.Notify(ch, syscall.SIGHUP) go func() { for { |