--- podman-git-07efc23e0.old/libpod/boltdb_state_internal.go
+++ podman-git-07efc23e0/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-07efc23e0.old/libpod/sqlite_state.go
+++ podman-git-07efc23e0/libpod/sqlite_state.go
@@ -436,10 +436,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
 	}
 
--- podman-git-07efc23e0.old/vendor/go.podman.io/common/pkg/config/containers.conf
+++ podman-git-07efc23e0/vendor/go.podman.io/common/pkg/config/containers.conf
@@ -299,7 +299,7 @@
 # Path to the seccomp.json profile which is used as the default seccomp profile
 # for the runtime.
 #
-#seccomp_profile = "/usr/share/containers/seccomp.json"
+seccomp_profile = "/usr/share/containers/seccomp.json"
 
 # Size of /dev/shm. Specified as <number><unit>.
 # Unit is optional, values:
@@ -493,6 +493,7 @@
 # Valid options "systemd" or "cgroupfs"
 #
 #cgroup_manager = "systemd"
+cgroup_manager = "cgroupfs"
 
 # Environment variables to pass into conmon
 #
@@ -585,12 +586,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.
 #