Make DB config validation an explicit step

Previously, we implicitly validated runtime configuration against
what was stored in the database as part of database init. Make
this an explicit step, so we can call it after the database has
been initialized. This will allow us to retrieve paths from the
database and use them to overwrite our defaults if they differ.

Signed-off-by: Matthew Heon <mheon@redhat.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/libpod/runtime.go b/libpod/runtime.go
index 8615e5e12..2e76f159b 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -448,6 +448,11 @@ func makeRuntime(runtime *Runtime) (err error) {
 		return errors.Wrapf(ErrInvalidArg, "unrecognized state type passed")
 	}
 
+	// Validate our config against the database
+	if err := runtime.state.ValidateDBConfig(runtime); err != nil {
+		return err
+	}
+
 	if err := runtime.state.SetNamespace(runtime.config.Namespace); err != nil {
 		return errors.Wrapf(err, "error setting libpod namespace in state")
 	}