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.

Sign up for GitHub

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
Merged

overlay: allow to reset mount_program #847

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f9fb70
overlay: allow to reset mount_program
giuseppe Mar 8, 2021
dde567a
overlay: improve overlay error message
giuseppe Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions drivers/overlay/overlay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,11 @@ func parseOptions(options []string) (*overlayOptions, error) {
}
case "mount_program":
logrus.Debugf("overlay: mount_program=%s", val)
_, err := os.Stat(val)
if err != nil {
return nil, fmt.Errorf("overlay: can't stat program %s: %v", val, err)
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)

}
}
o.mountProgram = val
case "skip_mount_home":
Expand Down