Skip to contentSkip to conversation

unionfs: add patch to revert to old pre-1.0 meta directory

PATCH New Peter Korsgaard 2 participants 2 messages Dec 18, 2015 – Dec 29, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 unionfs: add patch to revert to old pre-1.0 meta directory

Unionfs changed its meta directory from .unionfs to .unionfs-fuse with the unionfs -> unionfs-fuse rename. The rename later got reverted everywhere but the meta directory, so now unionfs doesn't find the whiteout files from older releases.

Revert back to the pre-1.0 behaviour to fix this.

Patch sent upstream: https://github.com/rpodgorny/unionfs-fuse/pull/38

---
 ...0001-Revert-to-old-pre-1.0-meta-directory.patch | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch
package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch new file +33 -0
new file mode 100644
index 0000000..c9d2ef4
@@ -0,0 +1,33 @@
+From 93c2f9bd8b058b28016e6db2421e5b38eac0606c Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <[email protected]>
+Date: Thu, 17 Dec 2015 15:06:38 +0100
+Subject: [PATCH] Revert to old pre-1.0 meta directory
+
+Unionfs changed its meta directory from .unionfs to .unionfs-fuse with the
+unionfs -> unionfs-fuse rename.  The rename later got reverted everywhere
+but the meta directory, so now unionfs doesn't find the whiteout files from
+older releases.
+
+Revert back to the pre-1.0 behaviour to fix this.
+
+Signed-off-by: Peter Korsgaard <[email protected]>
+---
+ src/unionfs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unionfs.h b/src/unionfs.h
+index c2b5ee3..74b824f 100644
+--- a/src/unionfs.h
++++ b/src/unionfs.h
+@@ -10,7 +10,7 @@
+ #define PATHLEN_MAX 1024
+ #define HIDETAG "_HIDDEN~"
+ 
+-#define METANAME ".unionfs-fuse"
++#define METANAME ".unionfs"
+ #define METADIR (METANAME  "/") // string concetanation!
+ 
+ // fuse meta files, we might want to hide those
+-- 
+2.1.4
+
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 unionfs: add patch to revert to old pre-1.0 meta directory

Peter,

Quoted 7 lines · Peter Korsgaard

Unionfs changed its meta directory from .unionfs to .unionfs-fuse with the unionfs -> unionfs-fuse rename. The rename later got reverted everywhere but the meta directory, so now unionfs doesn't find the whiteout files from older releases.

Revert back to the pre-1.0 behaviour to fix this.

Quoted 7 lines

Patch sent upstream: https://github.com/rpodgorny/unionfs-fuse/pull/38

---
 ...0001-Revert-to-old-pre-1.0-meta-directory.patch | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch

Applied, thanks. Since your patch was applied upstream, I've adjusted the commit log accordingly, and added a note in the patch itself with a reference to the upstream commit.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com