Merge pull request #8947 from Luap99/cleanup-code

Fix problems reported by staticcheck

1 files changed, 6 insertions, 11 deletions

diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 705086bda..575047f95 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -40,7 +40,6 @@ import (
 	"github.com/containers/storage/pkg/idtools"
 	securejoin "github.com/cyphar/filepath-securejoin"
 	runcuser "github.com/opencontainers/runc/libcontainer/user"
-	"github.com/opencontainers/runtime-spec/specs-go"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/selinux/go-selinux/label"
@@ -284,7 +283,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
 		return nil, err
 	}
 
-	g := generate.NewFromSpec(c.config.Spec)
+	g := generate.Generator{Config: c.config.Spec}
 
 	// If network namespace was requested, add it now
 	if c.config.CreateNetNS {
@@ -400,7 +399,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
 			return nil, errors.Wrapf(err, "failed to create TempDir in the %s directory", c.config.StaticDir)
 		}
 
-		var overlayMount specs.Mount
+		var overlayMount spec.Mount
 		if volume.ReadWrite {
 			overlayMount, err = overlay.Mount(contentDir, mountPoint, volume.Dest, c.RootUID(), c.RootGID(), c.runtime.store.GraphOptions())
 		} else {
@@ -1519,18 +1518,14 @@ func (c *Container) makeBindMounts() error {
 	}
 	if newPasswd != "" {
 		// Make /etc/passwd
-		if _, ok := c.state.BindMounts["/etc/passwd"]; ok {
-			// If it already exists, delete so we can recreate
-			delete(c.state.BindMounts, "/etc/passwd")
-		}
+		// If it already exists, delete so we can recreate
+		delete(c.state.BindMounts, "/etc/passwd")
 		c.state.BindMounts["/etc/passwd"] = newPasswd
 	}
 	if newGroup != "" {
 		// Make /etc/group
-		if _, ok := c.state.BindMounts["/etc/group"]; ok {
-			// If it already exists, delete so we can recreate
-			delete(c.state.BindMounts, "/etc/group")
-		}
+		// If it already exists, delete so we can recreate
+		delete(c.state.BindMounts, "/etc/group")
 		c.state.BindMounts["/etc/group"] = newGroup
 	}