diff --git a/pkg/config/config.go b/pkg/config/config.go index 0cfe042fc..64bd403a2 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -561,24 +561,6 @@ type SetOptions struct { // backwards compatibility with older versions of libpod for which we must // query the database configuration. Not included in the on-disk config. StorageConfigGraphDriverNameSet bool `toml:"-"` - - // StaticDirSet indicates if the StaticDir has been explicitly set by the - // config or by the user. It's required to guarantee backwards compatibility - // with older versions of libpod for which we must query the database - // configuration. Not included in the on-disk config. - StaticDirSet bool `toml:"-"` - - // VolumePathSet indicates if the VolumePath has been explicitly set by the - // config or by the user. It's required to guarantee backwards compatibility - // with older versions of libpod for which we must query the database - // configuration. Not included in the on-disk config. - VolumePathSet bool `toml:"-"` - - // TmpDirSet indicates if the TmpDir has been explicitly set by the config - // or by the user. It's required to guarantee backwards compatibility with - // older versions of libpod for which we must query the database - // configuration. Not included in the on-disk config. - TmpDirSet bool `toml:"-"` } // NetworkConfig represents the "network" TOML config table diff --git a/pkg/config/default.go b/pkg/config/default.go index 4b1537c75..77c8ae21d 100644 --- a/pkg/config/default.go +++ b/pkg/config/default.go @@ -301,8 +301,6 @@ func defaultEngineConfig() (*EngineConfig, error) { c.graphRoot = storeOpts.GraphRoot c.ImageCopyTmpDir = getDefaultTmpDir() - c.StaticDir = filepath.Join(storeOpts.GraphRoot, "libpod") - c.VolumePath = filepath.Join(storeOpts.GraphRoot, "volumes") c.VolumePluginTimeout = DefaultVolumePluginTimeout c.CompressionFormat = "gzip"