--- podman-git-b22d5c61e.old/vendor/github.com/containers/common/pkg/config/containers.conf
+++ podman-git-b22d5c61e/vendor/github.com/containers/common/pkg/config/containers.conf
@@ -540,12 +541,14 @@
 
 # A is a list of directories which are used to search for helper binaries.
 #
-#helper_binaries_dir = [
+helper_binaries_dir = [
+   "__META_PRODTREE__/podman/libexec/podman",
+   "/usr/bin"
 #  "/usr/local/libexec/podman",
 #  "/usr/local/lib/podman",
 #  "/usr/libexec/podman",
 #  "/usr/lib/podman",
-#]
+]
 
 # Path to OCI hooks directories for automatically executed hooks.
 #
--- podman-git-b22d5c61e/libpod/boltdb_state_internal.go~
+++ podman-git-b22d5c61e/libpod/boltdb_state_internal.go
@@ -263,8 +263,7 @@
 			return true, nil
 		}
 
-		return true, fmt.Errorf("database %s %q does not match our %s %q: %w",
-			toCheck.name, dbValue, toCheck.name, ourValue, define.ErrDBBadConfig)
+        return true, nil
 	}
 
 	return true, nil
--- podman-git-b22d5c61e/libpod/sqlite_state.go~	2024-08-03 00:33:23.000000000 -0700
+++ podman-git-b22d5c61e/libpod/sqlite_state.go	2024-08-03 02:13:53.259327883 -0700
@@ -406,10 +406,6 @@
 			}
 		}
 
-		if dbVal != ourVal {
-			return fmt.Errorf("database %s %q does not match our %s %q: %w", fieldName, dbVal, fieldName, ourVal, define.ErrDBBadConfig)
-		}
-
 		return nil
 	}