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

Only override the graphdriver to vfs if the priority is unset #1468

Merged

Conversation

dcermak
Copy link
Contributor

@dcermak dcermak commented Jan 13, 2023

This is an amend to #1460 That PR was not addressing the case when the system wide config had the driver_priority option configured and the user had no config file of their own. Then getRootlessStorageOpts would be called and it would override the graph driver to "vfs".

With this commit we only override the graph driver if driver priority is empty. Otherwise we propagate the driver priority into the storage options, so that the driver autodetection works as expected.

@dcermak dcermak marked this pull request as draft January 13, 2023 13:54
@dcermak dcermak marked this pull request as ready for review January 13, 2023 13:56
types/options.go Outdated Show resolved Hide resolved
This is an amend to containers#1460

That PR was not addressing the case when the system wide config had the
driver_priority option configured and the user had no config file of their
own. Then `getRootlessStorageOpts` would be called and it would override the
graph driver to "vfs".

With this commit we only override the graph driver if driver priority is
empty. Otherwise we propagate the driver priority into the storage options, so
that the driver autodetection works as expected.

Signed-off-by: Dan Čermák <dcermak@suse.com>
@dcermak dcermak force-pushed the dont-forget-driverpriority-in-rootless branch from e028490 to df0cb32 Compare January 16, 2023 08:04
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rhatdan
Copy link
Member

rhatdan commented Jan 16, 2023

LGTM

@rhatdan rhatdan merged commit 0af0a99 into containers:main Jan 16, 2023
@dcermak dcermak deleted the dont-forget-driverpriority-in-rootless branch January 16, 2023 14:26
@vrothberg vrothberg mentioned this pull request Jan 17, 2023
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.

None yet

3 participants