Ignore failure to ignore thinpool keys

Fixes: containers/podman#22473

Signed-off-by: Daniel J Walsh <[email protected]>

types/options.go

@@ -418,8 +418,13 @@ func ReloadConfigurationFile(configFile string, storeOptions *StoreOptions) erro
 	meta, err := toml.DecodeFile(configFile, &config)
 	if err == nil {
 		keys := meta.Undecoded()
-		if len(keys) > 0 {
-			logrus.Warningf("Failed to decode the keys %q from %q", keys, configFile)
+		for _, key := range keys {
+			// Since thinpool was removed older storage.conf files
+			// will generate bogus warnings
+			if key.String() == "storage.options.thinpool" {
+				continue
+			}
+			logrus.Warningf("Failed to decode the key %q from %q", key, configFile)
 		}
 	} else {
 		if !os.IsNotExist(err) {

types/options_test.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
-	"strings"
 	"testing"
 
 	"github.com/containers/storage/pkg/idtools"
@@ -204,5 +203,5 @@ func TestReloadConfigurationFile(t *testing.T) {
 	assert.Equal(t, storageOpts.RunRoot, "/run/containers/test")
 	logrus.SetOutput(os.Stderr)
 
-	assert.Equal(t, strings.Contains(content.String(), "Failed to decode the keys [\\\"foo\\\" \\\"storage.options.graphroot\\\"] from \\\"./storage_broken.conf\\\"\""), true)
+	require.Contains(t, content.String(), `Failed to decode the key "foo" from "./storage_broken.conf"`)
 }