Introduce deref cmd #11
Merged
Conversation
This file contains 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
|
Thanks for the PR! I'll take a look quickly. |
kmxz
requested changes
Aug 14, 2020
diff treats redirect dir as opaque - - lower files under redirect dir listed as deleted - upper dir listed as added vaccum also treats redirect dir as opaque - - it must not delete redirect upper dir becaue we do not know how to follow redirect to lower merge with redirect dir is complicated and not supported - - we abort merge when detecting a redirect dir to avoid deleting files under the redirected dir Signed-off-by: Amir Goldstein <[email protected]>
Data of metacopy upper is identical to lower by definition unless upper is redirected, so diff and vacuum work. merge is more complicated, so it is aborted if an upper metacopy is found. Signed-off-by: Amir Goldstein <[email protected]>
Signed-off-by: Amir Goldstein <[email protected]>
Comforms to the output format of 'diff -qr --no-dereference'. Signed-off-by: Amir Goldstein <[email protected]>
Expected output of 'overlay diff' is comitted as diff.saved. Expected output of 'overlay diff -v' is comitted as verbose.saved. Expected output of 'overlay diff -b' is generated with 'diff -qr'. Signed-off-by: Amir Goldstein <[email protected]>
It is not a real metacopy because it is missing the origin xattr, but for the diff tests it is sufficient. In the test data set, the victim file was unmodified, only permission bits changed, so diff results remain the same. Signed-off-by: Amir Goldstein <[email protected]>
"fake" that lower removed_dir was actually renamed and not removed, so all its children can be found under renamed_dir. The diff output results of diff and diff -b have an extra line for added directory /renamed_dir. The diff output of diff -v should have the children of renamed_dir, but overlay tools does not support listing redirected dir's childeren, so it also has that single added directory /renamed_dir. Signed-off-by: Amir Goldstein <[email protected]>
Instead of using full paths in script, use paths relative to $LOWERDIR and $UPPERDIR variables. Signed-off-by: Amir Goldstein <[email protected]>
For layers modifying scripts 'vaccuum' and 'merge' allow specifying command line arguments -L <newlower> and -U <newupper>. If those arguments are specified, the script will make a backup copy of lowerdir and/or upperdir and will make modifications to the backup copy instead of modifying the original. If niether upperdir nor lowerdir are going to be modified, relax the check for mounted overlayfs. Signed-off-by: Amir Goldstein <[email protected]>
copy changes from upperdir to a new upperdir unfolding redirect and metacopy to get a portable overlay upperdir layer. Signed-off-by: Amir Goldstein <[email protected]>
|
Merged. Much appreciation for the great contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
deref - copy changes from
upperdirtouppernewwhile unfolding redirect directories and metacopy regular files, so that new upperdir is compatible with legacy overlayfs driver.