opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 16:47:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add debug information when overriding paths with the DB

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2019-02-25 15:35:30 -05:00
parent 0d697573a6
commit 5a0a9dfa23
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libpod/runtime.go
View File

@ -629,24 +629,43 @@ func makeRuntime(runtime *Runtime) (err error) {
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",
logrus.Errorf("User-selected graph driver %q overwritten by graph driver %q 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 != "" {
if runtime.config.StorageConfig.GraphRoot != dbConfig.StorageRoot &&
runtime.config.StorageConfig.GraphRoot != "" {
logrus.Debugf("Overriding graph root %q with %q from database",
runtime.config.StorageConfig.GraphRoot, dbConfig.StorageRoot)
}
runtime.config.StorageConfig.GraphRoot = dbConfig.StorageRoot
}
if !runtime.configuredFrom.storageRunRootSet && dbConfig.StorageTmp != "" {
if runtime.config.StorageConfig.RunRoot != dbConfig.StorageTmp &&
runtime.config.StorageConfig.RunRoot != "" {
logrus.Debugf("Overriding run root %q with %q from database",
runtime.config.StorageConfig.RunRoot, dbConfig.StorageTmp)
}
runtime.config.StorageConfig.RunRoot = dbConfig.StorageTmp
}
if !runtime.configuredFrom.libpodStaticDirSet && dbConfig.LibpodRoot != "" {
if runtime.config.StaticDir != dbConfig.LibpodRoot && runtime.config.StaticDir != "" {
logrus.Debugf("Overriding static dir %q with %q from database", runtime.config.StaticDir, dbConfig.LibpodRoot)
}
runtime.config.StaticDir = dbConfig.LibpodRoot
}
if !runtime.configuredFrom.libpodTmpDirSet && dbConfig.LibpodTmp != "" {
if runtime.config.TmpDir != dbConfig.LibpodTmp && runtime.config.TmpDir != "" {
logrus.Debugf("Overriding tmp dir %q with %q from database", runtime.config.TmpDir, dbConfig.LibpodTmp)
}
runtime.config.TmpDir = dbConfig.LibpodTmp
}
if !runtime.configuredFrom.volPathSet && dbConfig.VolumePath != "" {
if runtime.config.VolumePath != dbConfig.VolumePath && runtime.config.VolumePath != "" {
logrus.Debugf("Overriding volume path %q with %q from database", runtime.config.VolumePath, dbConfig.VolumePath)
}
runtime.config.VolumePath = dbConfig.VolumePath
}