diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-23 22:15:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 22:15:16 +0100 |
| commit | c9e1f365e294135968bdd4d754dca7e1044587dc (patch) | |
| tree | e47c804ec1c1a16639d9aed0cf2da62403fe24d5 /libpod | |
| parent | 812894bcea68d975febf45f2e15fdd69b3e430b1 (diff) | |
| parent | a36006c2dcc40c62e05766e913cc8dc89602785c (diff) | |
| download | podman-c9e1f365e294135968bdd4d754dca7e1044587dc.tar.gz podman-c9e1f365e294135968bdd4d754dca7e1044587dc.tar.bz2 podman-c9e1f365e294135968bdd4d754dca7e1044587dc.zip | |
Merge pull request #2069 from mheon/warn_on_overriding_driver
Warn on overriding user-specified storage driver w/ DB
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 8e7ba8123..c7000d84a 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -555,6 +555,11 @@ func makeRuntime(runtime *Runtime) (err error) { // Reset defaults if they were not explicitly set if !runtime.configuredFrom.storageGraphDriverSet && dbConfig.GraphDriver != "" { + if runtime.config.StorageConfig.GraphDriverName != dbConfig.GraphDriver && + runtime.config.StorageConfig.GraphDriverName != "" { + logrus.Errorf("User-selected graph driver %s overwritten by graph driver %s from database - delete libpod local files to resolve", + runtime.config.StorageConfig.GraphDriverName, dbConfig.GraphDriver) + } runtime.config.StorageConfig.GraphDriverName = dbConfig.GraphDriver } if !runtime.configuredFrom.storageGraphRootSet && dbConfig.StorageRoot != "" { |