This repository was archived by the owner on Feb 24, 2020. It is now read-only.
scripts/pkg: improved detection of active mounts - #3710
#3710Merged
squeed merged 2 commits intoJun 16, 2017
rkt:masterrkt/rkt:masterfrom
tesujimath:rpm-scriptlet-partitionstesujimath/rkt:rpm-scriptlet-partitionsCopy head branch name to clipboard
Merged
scripts/pkg: improved detection of active mounts#3710squeed merged 2 commits intorkt:masterrkt/rkt:masterfrom tesujimath:rpm-scriptlet-partitionstesujimath/rkt:rpm-scriptlet-partitionsCopy head branch name to clipboard
squeed merged 2 commits into
rkt:masterrkt/rkt:masterfrom
tesujimath:rpm-scriptlet-partitionstesujimath/rkt:rpm-scriptlet-partitionsCopy head branch name to clipboard
Conversation
On systems which have /var/lib/rkt as a separate partition, the active mount detection in before-remove needs to not get confused by the presence of /var/lib/rkt itself as a mount. Therefore a longer path is used for active mount detection. Fixes rkt#3706
|
Can one of the admins verify this patch? |
Contributor
Author
|
@squeed PTAL |
If /var/lib/rkt is a mountpoint, we can't remove it, so check for this, and remove just the contents if it is so.
Contributor
|
Oh man, good catch. Checking. |
Contributor
|
LGTM! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On systems which have /var/lib/rkt as a separate partition, the active
mount detection in before-remove needs to not get confused by the
presence of /var/lib/rkt itself as a mount. Therefore a longer path
is used for active mount detection.
Fixes #3706