From d968f3fe09a4c7d74464cfe2eaa9e4febbe61ba5 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Tue, 20 Sep 2022 09:59:28 -0400
Subject: Replace deprecated ioutil

Package `io/ioutil` was deprecated in golang 1.16, preventing podman from
building under Fedora 37.  Fortunately, functionality identical
replacements are provided by the packages `io` and `os`.  Replace all
usage of all `io/ioutil` symbols with appropriate substitutions
according to the golang docs.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 utils/utils.go           | 5 ++---
 utils/utils_supported.go | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'utils')

diff --git a/utils/utils.go b/utils/utils.go
index 4d41ce5f8..5fb3695ce 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -5,7 +5,6 @@ import (
 	"crypto/rand"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"strconv"
@@ -114,7 +113,7 @@ var (
 // RunsOnSystemd returns whether the system is using systemd
 func RunsOnSystemd() bool {
 	runsOnSystemdOnce.Do(func() {
-		initCommand, err := ioutil.ReadFile("/proc/1/comm")
+		initCommand, err := os.ReadFile("/proc/1/comm")
 		// On errors, default to systemd
 		runsOnSystemd = err != nil || strings.TrimRight(string(initCommand), "\n") == "systemd"
 	})
@@ -122,7 +121,7 @@ func RunsOnSystemd() bool {
 }
 
 func moveProcessPIDFileToScope(pidPath, slice, scope string) error {
-	data, err := ioutil.ReadFile(pidPath)
+	data, err := os.ReadFile(pidPath)
 	if err != nil {
 		// do not raise an error if the file doesn't exist
 		if os.IsNotExist(err) {
diff --git a/utils/utils_supported.go b/utils/utils_supported.go
index d7d47b2bc..8844d46fd 100644
--- a/utils/utils_supported.go
+++ b/utils/utils_supported.go
@@ -8,7 +8,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -181,7 +180,7 @@ func moveUnderCgroup(cgroup, subtree string, processes []uint32) error {
 				}
 			}
 		} else {
-			processesData, err := ioutil.ReadFile(filepath.Join(cgroupRoot, parts[2], "cgroup.procs"))
+			processesData, err := os.ReadFile(filepath.Join(cgroupRoot, parts[2], "cgroup.procs"))
 			if err != nil {
 				return err
 			}
-- 
cgit v1.2.3-54-g00ecf