diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-31 19:21:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 19:21:46 +0100 |
| commit | 3e2d9f8662663f2f703bf674408d5255e493e18e (patch) | |
| tree | d27099f29c134e4351c98674d72cf42abf5efbe8 /libpod/boltdb_state.go | |
| parent | 1e750f7ca874ed24781de27cccf0346e5ec247bf (diff) | |
| parent | 11c282ab02e5e7daca0b13a3ddc9bbc4468e7a31 (diff) | |
| download | podman-3e2d9f8662663f2f703bf674408d5255e493e18e.tar.gz podman-3e2d9f8662663f2f703bf674408d5255e493e18e.tar.bz2 podman-3e2d9f8662663f2f703bf674408d5255e493e18e.zip | |
Merge pull request #4352 from vrothberg/config-package
refactor libpod config into libpod/config
Diffstat (limited to 'libpod/boltdb_state.go')
| -rw-r--r-- | libpod/boltdb_state.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index 0bb1df7b8..608a279c3 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -6,6 +6,7 @@ import ( "strings" "sync" + "github.com/containers/libpod/libpod/config" "github.com/containers/libpod/libpod/define" bolt "github.com/etcd-io/bbolt" jsoniter "github.com/json-iterator/go" @@ -291,12 +292,12 @@ func (s *BoltState) Refresh() error { // GetDBConfig retrieves runtime configuration fields that were created when // the database was first initialized -func (s *BoltState) GetDBConfig() (*DBConfig, error) { +func (s *BoltState) GetDBConfig() (*config.DBConfig, error) { if !s.valid { return nil, define.ErrDBClosed } - cfg := new(DBConfig) + cfg := new(config.DBConfig) db, err := s.getDBCon() if err != nil { |