Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-18 04:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

mk-sbuild,doc/mk-sbuild.1: aufs may still be used if overlayfs isn't

Browse Source 
available (as is the case on Debian).
This commit is contained in:
Stefano Rivera 2011-11-16 13:52:18 +02:00
parent 08afc2a0a9
commit c85373f911
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -1,8 +1,13 @@
ubuntu-dev-tools (0.136) UNRELEASED; urgency=low ubuntu-dev-tools (0.136) UNRELEASED; urgency=low
[ Marc Deslauriers ]
* mk-sbuild,doc/mk-sbuild.1: switch from aufs to overlayfs, as aufs is no * mk-sbuild,doc/mk-sbuild.1: switch from aufs to overlayfs, as aufs is no
longer in the Precise kernel. longer in the Precise kernel.
[ Stefano Rivera ]
* mk-sbuild,doc/mk-sbuild.1: aufs may still be used if overlayfs isn't
available (as is the case on Debian).
-- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 15 Nov 2011 16:01:32 -0500 -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 15 Nov 2011 16:01:32 -0500
ubuntu-dev-tools (0.135) unstable; urgency=low ubuntu-dev-tools (0.135) unstable; urgency=low

3
doc/mk-sbuild.1
View File

@ -54,7 +54,8 @@ Currently known distros: "\fBdebian\fR" and "\fBubuntu\fR".
.TP .TP
.B \-\-vg\fR=\fIVOLUME_GROUP .B \-\-vg\fR=\fIVOLUME_GROUP
Specify a volume group, and subsequently use a default \fBSCHROOT_TYPE\fR of Specify a volume group, and subsequently use a default \fBSCHROOT_TYPE\fR of
"\fBlvm-snapshot\fR" rather than "\fBdirectory\fR" (via overlayfs) mounts. "\fBlvm-snapshot\fR" rather than "\fBdirectory\fR" (via overlayfs or
aufs) mounts.
.TP .TP
.B \-\-type\fR=\fISHROOT_TYPE .B \-\-type\fR=\fISHROOT_TYPE
Specify a \fBSCHROOT_TYPE\fR. Supported values are "\fBdirectory\fR" Specify a \fBSCHROOT_TYPE\fR. Supported values are "\fBdirectory\fR"

15
mk-sbuild
View File

@ -24,7 +24,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
# (either with LVM or overlayfs) with schroot and sbuild. # (with LVM, btrfs, overlayfs, 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.
# #
@ -536,6 +536,17 @@ 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
directory|file)
if grep -q '\soverlayfs$' /proc/filesystems \
|| (/sbin/modprobe -l | grep -Fq '/overlayfs.ko'); then
OVERLAY_FS=overlayfs
else
OVERLAY_FS=aufs
fi
esac
# work around apt's GPG invocation that fails without root's .gnupg directory # work around apt's GPG invocation that fails without root's .gnupg directory
sudo mkdir -p -m 0700 "$MNT"/root/.gnupg sudo mkdir -p -m 0700 "$MNT"/root/.gnupg
@ -619,7 +630,7 @@ EOM
;; ;;
directory|file) directory|file)
cat >> "${TEMP_SCHROOTCONF}" <<EOM cat >> "${TEMP_SCHROOTCONF}" <<EOM
union-type=overlayfs union-type=$OVERLAY_FS
${SCHROOT_TYPE}=CHROOT_PATH ${SCHROOT_TYPE}=CHROOT_PATH
EOM EOM
;; ;;