Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-06-27 16:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for 'overlay' in favor of older 'overlayfs'.

Browse Source
This commit is contained in:
Dimitri John Ledkov 2018-03-23 02:55:01 +00:00
parent edb49c652c
commit 96d698e429
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,8 +1,12 @@
ubuntu-dev-tools (0.162) UNRELEASED; urgency=medium ubuntu-dev-tools (0.162) UNRELEASED; urgency=medium
[ Mattia Rizzolo ]
* Team upload. * Team upload.
* Fix test failures with newer flake8 and pylint. Closes: #891721 * Fix test failures with newer flake8 and pylint. Closes: #891721
[ Dimitri John Ledkov ]
* Add support for 'overlay' in favor of older 'overlayfs'.
-- Mattia Rizzolo <mattia@debian.org> Thu, 08 Mar 2018 12:35:24 +0100 -- Mattia Rizzolo <mattia@debian.org> Thu, 08 Mar 2018 12:35:24 +0100
ubuntu-dev-tools (0.161) unstable; urgency=medium ubuntu-dev-tools (0.161) unstable; urgency=medium

6
mk-sbuild
View File

@ -26,7 +26,7 @@
# ################################################################## # ##################################################################
# #
# This script creates chroots designed to be used in a snapshot mode # 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, # Much love to "man sbuild-setup", https://wiki.ubuntu.com/PbuilderHowto,
# and https://help.ubuntu.com/community/SbuildLVMHowto. # and https://help.ubuntu.com/community/SbuildLVMHowto.
# #
@ -626,9 +626,11 @@ case "$SCHROOT_TYPE" in
MNT=`mktemp -d -t schroot-XXXXXX` MNT=`mktemp -d -t schroot-XXXXXX`
esac esac
# Debian doesn't have overlayfs yet
case "$SCHROOT_TYPE" in case "$SCHROOT_TYPE" in
directory|file) directory|file)
if grep -q '\soverlay$' /proc/filesystems \
|| /sbin/modprobe -q --dry-run overlay; then
OVERLAY_FS=overlay
if grep -q '\soverlayfs$' /proc/filesystems \ if grep -q '\soverlayfs$' /proc/filesystems \
|| /sbin/modprobe -q --dry-run overlayfs; then || /sbin/modprobe -q --dry-run overlayfs; then
OVERLAY_FS=overlayfs OVERLAY_FS=overlayfs