Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GetStore modifications, Create GetLocalStorageConfig and SaveLocalStorageConfig #1096

Merged
merged 2 commits into from
Jan 11, 2022

Conversation

cdoern
Copy link
Contributor

@cdoern cdoern commented Jan 5, 2022

If passing either just a runroot or both a runroot and a graphroot
GetStore() was returning when finding a match for JUST the graph root,
overriding the runroot and using a different location than specified.

if either one or the other is passed, default the other option but if both are passed and not found together while searching the store, create a new store.

Also create two new helper functions which add the ability to retrieve and overwrite
the toml config in the user's storage.conf file

Signed-off-by: cdoern cdoern@redhat.com

@cdoern
Copy link
Contributor Author

cdoern commented Jan 6, 2022

@rhatdan PTAL, I'm adding this specifically for the podman reset flags I'm working on but either way the logic here seemed kind of broken

store.go Show resolved Hide resolved
store.go Show resolved Hide resolved
@cdoern cdoern changed the title GetStore modifications to prevent overriding runroot GetStore modifications, Create GetLocalStorageConfig and SaveLocalStorageConfig Jan 7, 2022
@cdoern
Copy link
Contributor Author

cdoern commented Jan 7, 2022

@rhatdan let me know if this is what you meant for editing the toml. I am not sure if there is a cleaner way to override the file but if there is I will do that instead.

types/options.go Outdated Show resolved Hide resolved
types/options.go Outdated Show resolved Hide resolved
types/options.go Outdated Show resolved Hide resolved
store.go Outdated Show resolved Hide resolved
@rhatdan
Copy link
Member

rhatdan commented Jan 10, 2022

store.go Outdated Show resolved Hide resolved
types/options.go Outdated Show resolved Hide resolved
If passing either just a runroot or both a runroot and a graphroot
GetStore() was returning when finding a match for JUST the graph root,
overriding the runroot and using a different location than specified

Also create two new helper functions which add the ability to retrieve and overwrite
the toml config in the user's storage.conf file

Signed-off-by: cdoern <cdoern@redhat.com>
@umohnani8
Copy link
Member

LGTM

@rhatdan
Copy link
Member

rhatdan commented Jan 11, 2022

flake not related to PR. Merging.

@rhatdan rhatdan merged commit 47136b3 into containers:main Jan 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants