Merge pull request #71 from giuseppe/no-copyup-whiteout

fuse-overlayfs: do not copyup a whiteout on rename
This commit is contained in:
Daniel J Walsh 2019-05-03 09:09:17 -04:00 committed by GitHub
commit 9f193e9f69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

2
main.c
View File

@ -3343,7 +3343,7 @@ ovl_rename_direct (fuse_req_t req, fuse_ino_t parent, const char *name,
destnode = NULL;
}
if (destnode)
if (destnode && !destnode_is_whiteout)
{
/* If the node is still accessible then be sure we
can write to it. Fix it to be done when a write is

View File

@ -4,7 +4,7 @@ mkdir lower upper workdir merged
fuse-overlayfs -o lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged
docker run --rm -ti -v merged:/merged fedora dnf --installroot /merged --releasever 29 install -y glibc-common
docker run --rm -ti -v merged:/merged fedora dnf --installroot /merged --releasever 29 install -y glibc-common gedit
umount merged
@ -18,4 +18,6 @@ fuse-overlayfs -o lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged
# Install some big packages
docker run --rm -ti -v merged:/merged fedora dnf --installroot /merged --releasever 29 install -y emacs texlive
docker run --rm -ti -v merged:/merged fedora sh -c 'rm /usr/share/glib-2.0/schemas/gschemas.compiled; glib-compile-schemas /usr/share/glib-2.0/schemas/'
umount merged