diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-26 17:02:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 17:02:03 +0100 |
| commit | 36df2e70738ab277699e8240f62355a67a6b2edb (patch) | |
| tree | 4d93d4383d90b110200c41561680c951cf14ba0a /libpod/boltdb_state_internal.go | |
| parent | 507ab29cfedbcc7503fe10c44ea9e331c5a3a5ca (diff) | |
| parent | ba6f1acf07d1eddcd810cdb4265a8961770329c6 (diff) | |
| download | podman-36df2e70738ab277699e8240f62355a67a6b2edb.tar.gz podman-36df2e70738ab277699e8240f62355a67a6b2edb.tar.bz2 podman-36df2e70738ab277699e8240f62355a67a6b2edb.zip | |
Merge pull request #2397 from mheon/volume_path_fixes
Volume path fixes
Diffstat (limited to 'libpod/boltdb_state_internal.go')
| -rw-r--r-- | libpod/boltdb_state_internal.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index 3d749849d..936ccbf4c 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -38,6 +38,7 @@ const ( graphRootName = "graph-root" graphDriverName = "graph-driver-name" osName = "os" + volPathName = "volume-path" ) var ( @@ -67,6 +68,7 @@ var ( graphRootKey = []byte(graphRootName) graphDriverKey = []byte(graphDriverName) osKey = []byte(osName) + volPathKey = []byte(volPathName) ) // Check if the configuration of the database is compatible with the @@ -105,10 +107,15 @@ func checkRuntimeConfig(db *bolt.DB, rt *Runtime) error { return err } - return validateDBAgainstConfig(configBkt, "storage graph driver", + if err := validateDBAgainstConfig(configBkt, "storage graph driver", rt.config.StorageConfig.GraphDriverName, graphDriverKey, - storage.DefaultStoreOptions.GraphDriverName) + storage.DefaultStoreOptions.GraphDriverName); err != nil { + return err + } + + return validateDBAgainstConfig(configBkt, "volume path", + rt.config.VolumePath, volPathKey, "") }) return err |