From dadf6384029fd6748a21832e4968261d1f7c60fd Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Mon, 4 May 2020 20:46:26 -0500 Subject: T1899: fix for unionfs-fuse rename of meta directory In release v1.0 of unionfs-fuse, the meta directory was renamed from .unionfs to .unionfs-fuse. Consequently, the clean up of the directory following a commit vacuously succeeds, and the meta data remains. On a subsequent commit, this hidden directory will be copied into the tmp directory structure. As permissions on the whiteout files belong solely to the user, commit actions in a multiuser environment may encounter permission errors, leading to a failure in commit. Change the meta directory name here to accord with the change in unionfs-fuse, but beware that the change is reverted in release v2.0 of unionfs-fuse. --- src/cstore/unionfs/cstore-unionfs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cstore/unionfs') diff --git a/src/cstore/unionfs/cstore-unionfs.cpp b/src/cstore/unionfs/cstore-unionfs.cpp index 8f440ea..e713dbd 100644 --- a/src/cstore/unionfs/cstore-unionfs.cpp +++ b/src/cstore/unionfs/cstore-unionfs.cpp @@ -66,7 +66,7 @@ const string UnionfsCstore::C_MARKER_DEF_VALUE = "def"; const string UnionfsCstore::C_MARKER_DEACTIVATE = ".disable"; const string UnionfsCstore::C_MARKER_CHANGED = ".modified"; const string UnionfsCstore::C_MARKER_UNSAVED = ".unsaved"; -const string UnionfsCstore::C_MARKER_UNIONFS = ".unionfs"; +const string UnionfsCstore::C_MARKER_UNIONFS = ".unionfs-fuse"; const string UnionfsCstore::C_COMMITTED_MARKER_FILE = ".changes"; const string UnionfsCstore::C_COMMENT_FILE = ".comment"; const string UnionfsCstore::C_TAG_NAME = "node.tag"; -- cgit v1.2.3