--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: Using multiple squashfs images does no longer work
- From: Gaudenz Steinlin <gaudenz@debian.org>
- Date: Fri, 21 Dec 2012 17:45:49 +0100
- Message-id: <20121221164549.22525.49835.reportbug@meteor.durcheinandertal.local>
Package: live-boot
Version: 3.0~b10-1
Severity: important
Tags: patch
The squeeze version of live-boot supported using multiple squashfs
images. This no longer works with the current version in sid. Multiple
squashfs images are important for large live systems that should work
from filesystems with a 4GB file size limit (e.g. iso9660).
While there was never support to create multiple squashfs images in
live-build this was working in previous versions if the squashafs are
manually split. IMO it's important to fix this regression in wheezy.
The attached patch fixes this bug.
Gaudenz
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (800, 'testing'), (700, 'unstable'), (50, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_CH.UTF-8, LC_CTYPE=de_CH.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From a82bfc59e7046e5388545b9ae0e3b3306be3617d Mon Sep 17 00:00:00 2001
From: Gaudenz Steinlin <gaudenz@debian.org>
Date: Fri, 21 Dec 2012 17:03:09 +0100
Subject: [PATCH] Fix support for multiple squashfs images
Support for multiple squashfs images got lost somewhen in the wheezy
release cycle. This add support for an arbitrary number of readonly
branches. Support for two branches was partially present, but not
working corectly in all cases.
---
scripts/boot/9990-misc-helpers.sh | 54 ++++++++++++++++++++-----------------
1 file changed, 29 insertions(+), 25 deletions(-)
diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
index 71ba7e1..d647c77 100755
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
@@ -1197,11 +1197,12 @@ link_files ()
do_union ()
{
- local unionmountpoint unionrw unionro1 unionro2
+ local unionmountpoint unionrw unionro
unionmountpoint="${1}" # directory where the union is mounted
- unionrw="${2}" # branch where the union changes are stored
- unionro1="${3}" # first underlying read-only branch (optional)
- unionro2="${4}" # second underlying read-only branch (optional)
+ shift
+ unionrw="${1}" # branch where the union changes are stored
+ shift
+ unionro="${*}" # space separated list of read-only branches (optional)
case "${UNIONTYPE}" in
aufs)
@@ -1225,13 +1226,12 @@ do_union ()
unionfs-fuse)
unionmountopts="-o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid"
unionmountopts="${unionmountopts} ${unionrw}=${rw_opt}"
- if [ -n "${unionro1}" ]
- then
- unionmountopts="${unionmountopts}:${unionro1}=${ro_opt}"
- fi
- if [ -n "${unionro2}" ]
+ if [ -n "${unionro}" ]
then
- unionmountopts="${unionmountopts}:${unionro2}=${ro_opt}"
+ for rofs in ${unionro}
+ do
+ unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
+ done
fi
( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
@@ -1240,21 +1240,27 @@ do_union ()
;;
overlayfs)
- # XXX: can unionro2 be used? (overlayfs only handles two dirs, but perhaps they can be chained?)
- # XXX: and can unionro1 be optional? i.e. can overlayfs skip lowerdir?
- unionmountopts="-o noatime,lowerdir=${unionro1},upperdir=${unionrw}"
+ # XXX: can multiple unionro be used? (overlayfs only handles two dirs, but perhaps they can be chained?)
+ # XXX: and can unionro be optional? i.e. can overlayfs skip lowerdir?
+ if echo ${unionro} | grep -q " "
+ then
+ panic "Multiple lower filesystems are currently not supported with overlayfs (unionro = ${unionro})."
+ elif [ -z "${unionro}" ]
+ then
+ panic "Overlayfs needs at least one lower filesystem (read-only branch)."
+ fi
+ unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}"
mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
;;
*)
unionmountopts="-o noatime,${noxino_opt},dirs=${unionrw}=${rw_opt}"
- if [ -n "${unionro1}" ]
- then
- unionmountopts="${unionmountopts}:${unionro1}=${ro_opt}"
- fi
- if [ -n "${unionro2}" ]
+ if [ -n "${unionro}" ]
then
- unionmountopts="${unionmountopts}:${unionro2}=${ro_opt}"
+ for rofs in ${unionro}
+ do
+ unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
+ done
fi
mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
;;
@@ -1491,15 +1497,13 @@ activate_custom_mounts ()
do
if [ -n "${rootmnt}" ]
then
- rootfs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")"
+ fs="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")"
else
- rootfs_dest_backing="${d}/${dest}"
+ fs="${d}/${dest}"
fi
- if [ -d "${rootfs_dest_backing}" ]
+ if [ -d "${fs}" ]
then
- break
- else
- rootfs_dest_backing=""
+ rootfs_dest_backing="${rootfs_dest_backing} ${fs}"
fi
done
fi
--
1.7.10.4
--- End Message ---
--- Begin Message ---
Source: live-boot
Source-Version: 4.0~a5-1
We believe that the bug you reported is fixed in the latest version of
live-boot, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 696494@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Daniel Baumann <daniel@debian.org> (supplier of updated live-boot package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Tue, 12 Feb 2013 08:29:27 +0100
Source: live-boot
Binary: live-boot live-boot-doc live-boot-initramfs-tools
Architecture: source all
Version: 4.0~a5-1
Distribution: experimental
Urgency: low
Maintainer: Debian Live Project <debian-live@lists.debian.org>
Changed-By: Daniel Baumann <daniel@debian.org>
Description:
live-boot - Live System Boot Scripts
live-boot-doc - Live System Boot Scripts (documentation)
live-boot-initramfs-tools - Live System Boot Scripts (initramfs-tools backend)
Closes: 696494 696495 697873
Changes:
live-boot (4.0~a5-1) experimental; urgency=low
.
[ Daniel Baumann ]
* Updating manpage year handling for 2013.
.
[ Richard Nelson ]
* Replace noprompt with noeject on manpage.
.
[ Daniel Baumann ]
* Updating noeject description in manpage.
.
[ chals ]
* Updating Spanish translation in respect to noeject.
.
[ Daniel Baumann ]
* Dropping dpkg compression level.
* Calling df with -P to avoid line wraps with overly long mountpoints.
* Removing some dead code in netbase parts.
.
[ Gaudenz Steinlin ]
* Fixing support for multiple squashfs images (Closes: #696494).
* Fixing mounting of rootfs, cow and medium filesystems (Closes:
#696495).
.
[ Daniel Baumann ]
* Adding 3.0.0-1 changelog entries.
* Updating manpage for persistence-label, thanks to Mike Gach
<gach.mqt@gmail.com> (Closes: #697873).
Checksums-Sha1:
f77a17d4d0b83037caf3f80fd04f75990a99c1c8 1376 live-boot_4.0~a5-1.dsc
4a0d1d43157b8ac3a42a12a53f3688d023094f4e 58292 live-boot_4.0~a5.orig.tar.xz
4bb6136e9e2f071cb9eb7c8fdc23bdeed158bb4f 22456 live-boot_4.0~a5-1.debian.tar.xz
9fefd13a0790bae5cff8336e94c93be0cd437a26 48654 live-boot_4.0~a5-1_all.deb
d426514cfde12a008e860b86ec1cc1c0fc40290d 51554 live-boot-doc_4.0~a5-1_all.deb
a99819c5b276b6d8639080b9fa704716f7d4ab0a 26424 live-boot-initramfs-tools_4.0~a5-1_all.deb
Checksums-Sha256:
2fc30550b53eb86039b747dbe258fbbcab9d1a8e49ea921a96bf1cf9ad9dfd24 1376 live-boot_4.0~a5-1.dsc
99272c8e0af14d9434ce03e82d0e5c9e05629706e9561d0a8b16e7970afda812 58292 live-boot_4.0~a5.orig.tar.xz
e33c69bb41e7a941b7324f1c9021bd437da823a44703ad79957e972f1505a25b 22456 live-boot_4.0~a5-1.debian.tar.xz
9bc2d87347251859dce4e0b8039e37660a311f6cd3065641f24a3aba5c74512f 48654 live-boot_4.0~a5-1_all.deb
fa9647831c1e9d91cb91b829db19a3eb04cd0bd299285867d2a1aed29e38e3e7 51554 live-boot-doc_4.0~a5-1_all.deb
3be8a623a6f2c2ea81df8745047d013d23ee0aecd30e46c7a42dd2b4cd8ebc4f 26424 live-boot-initramfs-tools_4.0~a5-1_all.deb
Files:
a6ec0392466cf4fc6da11d84dc92a117 1376 misc optional live-boot_4.0~a5-1.dsc
83eabe33a81ea5754b210e9449fe5f06 58292 misc optional live-boot_4.0~a5.orig.tar.xz
da72f1bb94bed706253861d1b4b2ba81 22456 misc optional live-boot_4.0~a5-1.debian.tar.xz
4c166596545aa322c800ec769082dfc4 48654 misc optional live-boot_4.0~a5-1_all.deb
4397e46bff3f053edca5e77c9e33bf2f 51554 doc optional live-boot-doc_4.0~a5-1_all.deb
f3a2e5a7a8b311a9ba7a7b0eefc68005 26424 misc optional live-boot-initramfs-tools_4.0~a5-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEARECAAYFAlEZ75gACgkQ+C5cwEsrK54oagCePssHbldi3A/hRsaNQxC/te22
H5AAoOAKIbBrijGGmctlhSBxR6v1B3IP
=tjRy
-----END PGP SIGNATURE-----
--- End Message ---