From 96d698e4290ba352384f8d493563696675d85df8 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 23 Mar 2018 02:55:01 +0000 Subject: [PATCH] Add support for 'overlay' in favor of older 'overlayfs'. --- debian/changelog | 4 ++++ mk-sbuild | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 79387f1..538bff2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ ubuntu-dev-tools (0.162) UNRELEASED; urgency=medium + [ Mattia Rizzolo ] * Team upload. * Fix test failures with newer flake8 and pylint. Closes: #891721 + [ Dimitri John Ledkov ] + * Add support for 'overlay' in favor of older 'overlayfs'. + -- Mattia Rizzolo Thu, 08 Mar 2018 12:35:24 +0100 ubuntu-dev-tools (0.161) unstable; urgency=medium diff --git a/mk-sbuild b/mk-sbuild index c052837..f8d3070 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -26,7 +26,7 @@ # ################################################################## # # This script creates chroots designed to be used in a snapshot mode -# (with LVM, btrfs, overlayfs, or aufs) with schroot and sbuild. +# (with LVM, btrfs, overlay, or aufs) with schroot and sbuild. # Much love to "man sbuild-setup", https://wiki.ubuntu.com/PbuilderHowto, # and https://help.ubuntu.com/community/SbuildLVMHowto. # @@ -626,9 +626,11 @@ case "$SCHROOT_TYPE" in MNT=`mktemp -d -t schroot-XXXXXX` esac -# Debian doesn't have overlayfs yet case "$SCHROOT_TYPE" in directory|file) + if grep -q '\soverlay$' /proc/filesystems \ + || /sbin/modprobe -q --dry-run overlay; then + OVERLAY_FS=overlay if grep -q '\soverlayfs$' /proc/filesystems \ || /sbin/modprobe -q --dry-run overlayfs; then OVERLAY_FS=overlayfs