summaryrefslogtreecommitdiff
path: root/libpod/container_internal_common.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-09-21 16:12:25 +0200
committerGitHub <noreply@github.com>2022-09-21 16:12:25 +0200
commit12655484e39eadbc0fa0607542aa4a49a21013a1 (patch)
tree9690fd321a567f302c0fc2d46854b00316af3957 /libpod/container_internal_common.go
parenta4399ef813840b48fc027edc3d0bdedf8a038f23 (diff)
parentd968f3fe09a4c7d74464cfe2eaa9e4febbe61ba5 (diff)
downloadpodman-12655484e39eadbc0fa0607542aa4a49a21013a1.tar.gz
podman-12655484e39eadbc0fa0607542aa4a49a21013a1.tar.bz2
podman-12655484e39eadbc0fa0607542aa4a49a21013a1.zip
Merge pull request #15871 from cevich/replace_ioutil
Replace deprecated ioutil
Diffstat (limited to 'libpod/container_internal_common.go')
-rw-r--r--libpod/container_internal_common.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go
index a0ae22ff4..874e9affe 100644
--- a/libpod/container_internal_common.go
+++ b/libpod/container_internal_common.go
@@ -8,7 +8,6 @@ import (
"errors"
"fmt"
"io"
- "io/ioutil"
"math"
"os"
"os/user"
@@ -788,7 +787,7 @@ func (c *Container) createCheckpointImage(ctx context.Context, options Container
}
// Export checkpoint into temporary tar file
- tmpDir, err := ioutil.TempDir("", "checkpoint_image_")
+ tmpDir, err := os.MkdirTemp("", "checkpoint_image_")
if err != nil {
return err
}
@@ -2442,7 +2441,7 @@ func (c *Container) generatePasswdAndGroup() (string, string, error) {
if err != nil {
return "", "", fmt.Errorf("creating path to container %s /etc/passwd: %w", c.ID(), err)
}
- orig, err := ioutil.ReadFile(originPasswdFile)
+ orig, err := os.ReadFile(originPasswdFile)
if err != nil && !os.IsNotExist(err) {
return "", "", err
}
@@ -2488,7 +2487,7 @@ func (c *Container) generatePasswdAndGroup() (string, string, error) {
if err != nil {
return "", "", fmt.Errorf("creating path to container %s /etc/group: %w", c.ID(), err)
}
- orig, err := ioutil.ReadFile(originGroupFile)
+ orig, err := os.ReadFile(originGroupFile)
if err != nil && !os.IsNotExist(err) {
return "", "", err
}