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

Switch references of /var/run -> /run #8771

Merged
merged 1 commit into from
Jan 7, 2021

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Dec 18, 2020

Systemd is now complaining or mentioning /var/run as a legacy directory.
It has been many years where /var/run is a symlink to /run on all
most distributions, make the change to the default.

Partial fix for #8369

Signed-off-by: Daniel J Walsh [email protected]

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 18, 2020
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -75,7 +75,7 @@ EOF
is "$output" "/var/lib/containers/storage" "GraphRoot in expected place"
GRAPH_ROOT="$output"
run_podman info --format '{{.Store.RunRoot}}'
is "$output" "/var/run/containers/storage" "RunRoot in expected place"
is "$output" "/run/containers/storage" "RunRoot in expected place"
Copy link
Member

Choose a reason for hiding this comment

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

I think you want to stet this. From what I'm seeing, RunRoot goes a lot deeper and will require a lot more changes.

Copy link
Member Author

Choose a reason for hiding this comment

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

I changed the match to match .*/run/containers/storage

@mheon
Copy link
Member

mheon commented Dec 18, 2020

LGTM

@rhatdan rhatdan force-pushed the run branch 3 times, most recently from 4996725 to a9d5f2b Compare December 23, 2020 19:12

Overrides the first `FROM` instruction within the Containerfile. If there are multiple
FROM instructions in a Containerfile, only the first is changed.

Copy link
Member

Choose a reason for hiding this comment

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

Looks like we need to get a Buildah release together soon and vendored....

@TomSweeneyRedHat
Copy link
Member

Changes LGTM, but all kinds of test unhappiness.

Systemd is now complaining or mentioning /var/run as a legacy directory.
It has been many years where /var/run is a symlink to /run on all
most distributions, make the change to the default.

Partial fix for containers#8369

Signed-off-by: Daniel J Walsh <[email protected]>
@rhatdan rhatdan added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2021
@openshift-merge-robot openshift-merge-robot merged commit 6c132b7 into containers:master Jan 7, 2021
edsantiago added a commit to edsantiago/libpod that referenced this pull request Jan 12, 2021
PR containers#8851 broke CI: it included "/var/run" strings that,
per containers#8771, should have been just "/run".

Signed-off-by: Ed Santiago <[email protected]>
rhatdan pushed a commit to rhatdan/podman that referenced this pull request Jan 12, 2021
PR containers#8851 broke CI: it included "/var/run" strings that,
per containers#8771, should have been just "/run".

Signed-off-by: Ed Santiago <[email protected]>
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants