mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-21 13:44:08 +00:00
Compare commits
9 Commits
ubuntu/mas
...
2.441.5
Author | SHA1 | Date | |
---|---|---|---|
|
0259fee5dc | ||
|
91bde498cb | ||
|
af5510caf9 | ||
|
0129af508b | ||
|
60971f3ed3 | ||
|
5a068b569d | ||
|
8c0354d18c | ||
|
1b95302ef7 | ||
|
8b141ef85a |
31
debian/changelog
vendored
31
debian/changelog
vendored
@ -1,3 +1,34 @@
|
||||
livecd-rootfs (2.441.5) zesty; urgency=medium
|
||||
|
||||
[ Colin Watson ]
|
||||
* Mount and unmount /dev recursively, to cope with setups where there are
|
||||
interesting bind-mounts under /dev (e.g. loop devices bind-mounted by
|
||||
LXD). LP: #1716465.
|
||||
|
||||
[ Balint Reczey ]
|
||||
* Fix suppression of kpartx error. LP: #1684090.
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 11 Sep 2017 11:59:59 -0700
|
||||
|
||||
livecd-rootfs (2.441.4) zesty; urgency=medium
|
||||
|
||||
[ Balint Reczey ]
|
||||
* wrap kpartx and trap spurious errors, to work around kpartx
|
||||
unreliability as seen in autopkgtests. (LP: #1684090)
|
||||
|
||||
[ Steve Langasek ]
|
||||
* Mark autopkgtests isolation-machine since debootstrap won't work in a
|
||||
container.
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 06 Jun 2017 23:09:10 -0700
|
||||
|
||||
livecd-rootfs (2.441.3) zesty; urgency=medium
|
||||
|
||||
* live-build/ubuntu-cpc/hooks/999-extras.binary: Exit on first failure.
|
||||
(LP: #1687752)
|
||||
|
||||
-- Robert C Jennings <robert.jennings@canonical.com> Tue, 09 May 2017 13:46:01 -0700
|
||||
|
||||
livecd-rootfs (2.441.2) zesty; urgency=medium
|
||||
|
||||
* The ubuntu-server:live should use a casper-based initramfs to work
|
||||
|
2
debian/tests/control
vendored
2
debian/tests/control
vendored
@ -1,3 +1,3 @@
|
||||
Tests: default-bootstraps
|
||||
Depends: @, lsb-release
|
||||
Restrictions: needs-root
|
||||
Restrictions: needs-root isolation-machine
|
||||
|
@ -11,9 +11,22 @@ backing_img=
|
||||
apt-get -qqy install dosfstools gdisk
|
||||
|
||||
clean_loops() {
|
||||
local kpartx_ret
|
||||
local kpartx_stdout
|
||||
|
||||
if [ -n "${backing_img}" ]; then
|
||||
kpartx -v -d "${backing_img}"
|
||||
# sync before removing loop to avoid "Device or resource busy" errors
|
||||
sync
|
||||
kpartx_ret=""
|
||||
kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
|
||||
echo "$kpartx_stdout"
|
||||
if [ -n "$kpartx_ret" ]; then
|
||||
if echo "$kpartx_stdout" | grep -q "loop deleted"; then
|
||||
echo "Suppressing kpartx returning error (#860894)"
|
||||
else
|
||||
exit $kpartx_ret
|
||||
fi
|
||||
fi
|
||||
unset backing_img
|
||||
fi
|
||||
|
||||
@ -69,8 +82,7 @@ mount_image() {
|
||||
setup_mountpoint() {
|
||||
local mountpoint="$1"
|
||||
|
||||
mount --bind /dev "$mountpoint/dev"
|
||||
mount devpts-live -t proc "$mountpoint/dev/pts"
|
||||
mount --rbind /dev "$mountpoint/dev"
|
||||
mount proc-live -t proc "$mountpoint/proc"
|
||||
mount sysfs-live -t sysfs "$mountpoint/sys"
|
||||
mount -t tmpfs none "$mountpoint/tmp"
|
||||
@ -131,11 +143,7 @@ umount_settle() {
|
||||
umount_partition() {
|
||||
local mountpoint=${1}
|
||||
mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
|
||||
for submnt in proc sys dev/pts dev tmp;
|
||||
do
|
||||
umount $mountpoint/$submnt
|
||||
done
|
||||
umount $mountpoint
|
||||
umount -R $mountpoint
|
||||
udevadm settle
|
||||
|
||||
if [ -n "${rootfs_dev_mapper}" -a -b "${rootfs_dev_mapper}" ]; then
|
||||
|
@ -39,8 +39,7 @@ chroot binary/boot/squashfs.dir dpkg-divert --remove --local --rename /usr/sbin/
|
||||
mv resolv.conf.tmp "binary/boot/squashfs.dir/etc/resolv.conf"
|
||||
umount "binary/boot/squashfs.dir/proc"
|
||||
umount "binary/boot/squashfs.dir/sys"
|
||||
umount "binary/boot/squashfs.dir/dev/pts"
|
||||
umount "binary/boot/squashfs.dir/dev"
|
||||
umount -R "binary/boot/squashfs.dir/dev"
|
||||
umount "binary/boot/squashfs.dir/tmp"
|
||||
|
||||
apt-get -qqy install squashfs-tools
|
||||
|
@ -13,4 +13,4 @@ export CLOUD_IMG_STR="$IMAGE_STR"
|
||||
export FS_LABEL="cloudimg-rootfs"
|
||||
|
||||
# Cleaner execution
|
||||
/bin/run-parts --regex ".*\.binary" "${extra_d}"
|
||||
/bin/run-parts --exit-on-error --regex ".*\.binary" "${extra_d}"
|
||||
|
@ -155,8 +155,7 @@ umount "$SQUASH_ROOT"
|
||||
# Then we can start unmounting the "real" root:
|
||||
umount "binary/boot/squashfs.dir/proc"
|
||||
umount "binary/boot/squashfs.dir/sys"
|
||||
umount "binary/boot/squashfs.dir/dev/pts"
|
||||
umount "binary/boot/squashfs.dir/dev"
|
||||
umount -R "binary/boot/squashfs.dir/dev"
|
||||
umount "binary/boot/squashfs.dir/tmp"
|
||||
|
||||
apt-get -qqy install squashfs-tools
|
||||
|
Loading…
x
Reference in New Issue
Block a user