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

Change default location for storage.conf to... #1221

Merged
merged 2 commits into from
May 3, 2022

Conversation

dfr
Copy link
Contributor

@dfr dfr commented May 2, 2022

... /usr/local/etc/containers on FreeBSD

Signed-off-by: Doug Rabson [email protected]

@dfr
Copy link
Contributor Author

dfr commented May 2, 2022

Looks like I broke the darwin build - I'll update the PR shortly

@dfr dfr force-pushed the storage-conf branch 2 times, most recently from 0f579cc to fdcda1f Compare May 2, 2022 12:35

// defaultConfigFile path to the system wide storage.conf file
var (
defaultConfigFile = "/usr/local/share/containers/storage.conf"
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think the example conf file should change instead. Generally, this kind of thing tends to live either in /usr/local/share or /usr/local/etc with any file likely to be changed locally strongly preferred to be in /usr/local/etc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I changed storage.conf-freebsd to match the compiled in default

Copy link
Member

Choose a reason for hiding this comment

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

THat works for me, I was mostly concerned about the difference between the two. Thanks @dfr

@dfr dfr force-pushed the storage-conf branch from fdcda1f to ae67ca3 Compare May 3, 2022 14:39
... /usr/local/etc/containers on FreeBSD

Signed-off-by: Doug Rabson <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented May 3, 2022

LGTM

@rhatdan
Copy link
Member

rhatdan commented May 3, 2022

@giuseppe PTAL

@giuseppe
Copy link
Member

giuseppe commented May 3, 2022

LGTM

Copy link
Collaborator

@flouthoc flouthoc 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 rhatdan merged commit 9d56beb into containers:main May 3, 2022
rhatdan added a commit to rhatdan/storage that referenced this pull request May 3, 2022
Change default location for storage.conf to...

Signed-off-by: Daniel J Walsh <[email protected]>
@dfr dfr deleted the storage-conf branch June 13, 2023 09:42
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.

5 participants