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

overlay: allow to reset mount_program #847

Merged
merged 2 commits into from
Mar 8, 2021

Conversation

giuseppe
Copy link
Member

@giuseppe giuseppe commented Mar 8, 2021

if the mount_program is set to the empty string then clear its value
and not use a mount program instead of failing.

Signed-off-by: Giuseppe Scrivano [email protected]

if the mount_program is set to the empty string then clear its value
and not use a mount program instead of failing.

Signed-off-by: Giuseppe Scrivano <[email protected]>
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

LGTM

if val != "" {
_, err := os.Stat(val)
if err != nil {
return nil, fmt.Errorf("overlay: can't stat program %s: %v", val, err)
Copy link
Member

Choose a reason for hiding this comment

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

non-blocking nit since we're here

Suggested change
return nil, fmt.Errorf("overlay: can't stat program %s: %v", val, err)
return nil, errors.Wrapf(err, "overlay: can't stat program %s", val)

Copy link
Member Author

Choose a reason for hiding this comment

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

thanks! I've added a new patch with:

				return nil, errors.Wrapf(err, "overlay: can't stat program %q", val)

@rhatdan
Copy link
Member

rhatdan commented Mar 8, 2021

LGTM
Although I am not sure why the tests are failing. Refired.

@giuseppe
Copy link
Member Author

giuseppe commented Mar 8, 2021

tests are green now

@rhatdan rhatdan merged commit 5be7b92 into containers:master Mar 8, 2021
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.

3 participants