Control: tag 785633 + patch Control: tag 785136 + patch Hi,
Base on Felipe's patch posted at https://github.com/codelibre-net/schroot/issues/1, it seems to work for me on some basic tests; I would appreciate further testing. The patch is attached. I also prepared a source package based on it, ready to be built: https://people.debian.org/~terceiro/schroot-overlay/ I would be willing to do an NMU to have this in the archive; I imagine that a lot of other people's workflow is broken as mine was. -- Antonio Terceiro <terce...@debian.org>
From 17d296755014332f808ce9408685f4244ae8861f Mon Sep 17 00:00:00 2001
From: Felipe Sateler <ffsate...@debian.org>
Date: Sat, 23 May 2015 17:00:30 -0300
Subject: [PATCH] Support union mounts with overlay, as in Linux 4.0
Signed-off-by: Felipe Sateler <ffsate...@debian.org>
Signed-off-by: Antonio Terceiro <terce...@debian.org>
--- a/etc/setup.d/10mount
+++ b/etc/setup.d/10mount
@@ -122,6 +122,9 @@ do_mount_fs_union()
overlayfs)
CHROOT_UNION_MOUNT_OPTIONS="lowerdir=${CHROOT_UNION_UNDERLAY_DIRECTORY},upperdir=${CHROOT_UNION_OVERLAY_DIRECTORY}"
;;
+ overlay)
+ mkdir -p ${CHROOT_UNION_OVERLAY_DIRECTORY}/upper ${CHROOT_UNION_OVERLAY_DIRECTORY}/work
+ CHROOT_UNION_MOUNT_OPTIONS="lowerdir=${CHROOT_UNION_UNDERLAY_DIRECTORY},upperdir=${CHROOT_UNION_OVERLAY_DIRECTORY}/upper,workdir=${CHROOT_UNION_OVERLAY_DIRECTORY}/work"
esac
fi
--- a/sbuild/sbuild-chroot-facet-union.cc
+++ b/sbuild/sbuild-chroot-facet-union.cc
@@ -136,6 +136,7 @@ void
chroot_facet_union::set_union_type (std::string const& type)
{
if (type == "aufs" ||
+ type == "overlay" ||
type == "overlayfs" ||
type == "unionfs" ||
type == "none")
--- a/man/schroot.conf.5.man
+++ b/man/schroot.conf.5.man
@@ -446,8 +446,8 @@ optional.
.TP
\f[CBI]union\-type=\fP\f[CI]type\fP
Set the union filesystem type. Currently supported filesystems are
-\[oq]aufs\[cq], \[oq]overlayfs\[cq] and \[oq]unionfs\[cq]. The default is
-\[oq]none\[cq], which disables this feature.
+\[oq]aufs\[cq], \[oq]overlayfs\[cq], \[oq]overlay\[cq] (as of Linux 4.0+) and
+\[oq]unionfs\[cq]. The default is \[oq]none\[cq], which disables this feature.
.TP
\f[CBI]union\-mount\-options=\fP\f[CI]options\fP
Union filesystem mount options (branch configuration), used for mounting the
signature.asc
Description: Digital signature
