diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-12 06:50:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-12 06:50:48 +0200 |
| commit | 1635fe8620fa454647cf7db2af9ed0c9b52eacfb (patch) | |
| tree | 814768e6b942e199a6974e2f60a7082a004def18 /pkg/util | |
| parent | 940d3d889221e21cc24705381b2c2d11d75f39bf (diff) | |
| parent | 118546c6a70704a7b19cb99f3c948b28264628de (diff) | |
| download | podman-1635fe8620fa454647cf7db2af9ed0c9b52eacfb.tar.gz podman-1635fe8620fa454647cf7db2af9ed0c9b52eacfb.tar.bz2 podman-1635fe8620fa454647cf7db2af9ed0c9b52eacfb.zip | |
Merge pull request #15737 from Juneezee/refactor/os.ReadDir
refactor: use `os.ReadDir` for lightweight directory reading
Diffstat (limited to 'pkg/util')
| -rw-r--r-- | pkg/util/utils_linux.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go index e2d9e3e89..7b2d98666 100644 --- a/pkg/util/utils_linux.go +++ b/pkg/util/utils_linux.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "io/fs" - "io/ioutil" "os" "path/filepath" "strings" @@ -119,7 +118,7 @@ func AddPrivilegedDevices(g *generate.Generator) error { // based on getDevices from runc (libcontainer/devices/devices.go) func getDevices(path string) ([]spec.LinuxDevice, error) { - files, err := ioutil.ReadDir(path) + files, err := os.ReadDir(path) if err != nil { if rootless.IsRootless() && os.IsPermission(err) { return nil, nil @@ -146,7 +145,7 @@ func getDevices(path string) ([]spec.LinuxDevice, error) { } case f.Name() == "console": continue - case f.Mode()&os.ModeSymlink != 0: + case f.Type()&os.ModeSymlink != 0: continue } |