From a6f8cad545fa3242a2778c9a0d25da4da0a51ce2 Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Mon, 30 May 2022 15:25:57 +0200
Subject: [PATCH] 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>
---
 cmd/podman/utils/signals_linux.go   | 15 ---------------
 cmd/podman/utils/signals_windows.go | 15 ---------------
 pkg/domain/infra/runtime_libpod.go  |  4 ++--
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 cmd/podman/utils/signals_linux.go
 delete mode 100644 cmd/podman/utils/signals_windows.go

diff --git a/cmd/podman/utils/signals_linux.go b/cmd/podman/utils/signals_linux.go
deleted file mode 100644
index dd0507c0e0c9..000000000000
--- 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 e6fcc1b32aac..000000000000
--- 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 ac557e9dedfe..daa6f0cbfbb1 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 {