Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-02 14:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.732

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2021-08-03 04:30:29 +00:00
parent 7424620251
commit ecfce21c6b
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
debian/changelog vendored
View File

@ -1,3 +1,26 @@
livecd-rootfs (2.732) impish; urgency=medium
[ Michael Hudson-Doyle ]
* lb_chroot_layered: fix quoting when searching for
trusted.overlay.opaque
[ Łukasz 'sil2100' Zemczak ]
* Revert previous change of fixing /dev sharing - this causes weird
autopkgtest issues.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Mon, 02 Aug 2021 22:10:11 +0200
livecd-rootfs (2.731) impish; urgency=medium
[ Jason C. McDonald ]
* Generate manifest for HyperV desktop image
[ Łukasz 'sil2100' Zemczak ]
* Fix sharing of the /dev tree to make sure we can safely umount the chroot
when needed. This fixes local non-livefs-builder image builds.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 28 Jul 2021 22:01:56 +0200
livecd-rootfs (2.730) impish; urgency=medium livecd-rootfs (2.730) impish; urgency=medium
* Rename subarch of intel-iotg to intel-iot, add support for intel-iot * Rename subarch of intel-iotg to intel-iot, add support for intel-iot

3
live-build/auto/config
View File

@ -625,7 +625,8 @@ case $PROJECT in
add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages
add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages
add_task minimal.standard.live ubuntu-live add_task minimal.standard.live ubuntu-live
add_package minimal.standard.live lupin-casper add_package minimal cloud-init
remove_package minimal.standard.live ubiquity-frontend-gtk
add_snap minimal.standard.live ubuntu-desktop-installer/classic add_snap minimal.standard.live ubuntu-desktop-installer/classic
# LANG PASS for minimal and standard # LANG PASS for minimal and standard

4
live-build/lb_chroot_layered
View File

@ -130,7 +130,7 @@ reduce_pass_size () {
if ! diff --brief --no-dereference "$pass_dir/$f" "$parent_pass_dir/$f" >/dev/null; then if ! diff --brief --no-dereference "$pass_dir/$f" "$parent_pass_dir/$f" >/dev/null; then
continue continue
fi fi
p=$(dirname $f) p="$(dirname "$f")"
while [ "$p" != . ]; do while [ "$p" != . ]; do
# As explained in the overlayfs documentation # As explained in the overlayfs documentation
# https://www.kernel.org/doc/html/latest/filesystems/overlayfs.html#whiteouts-and-opaque-directories # https://www.kernel.org/doc/html/latest/filesystems/overlayfs.html#whiteouts-and-opaque-directories
@ -147,7 +147,7 @@ reduce_pass_size () {
Echo_message "reduce_pass_size: '%s' would be removed from overlay but for trusted.overlay.opaque on '%s'" "$f" "$p" Echo_message "reduce_pass_size: '%s' would be removed from overlay but for trusted.overlay.opaque on '%s'" "$f" "$p"
continue 2 continue 2
fi fi
p=$(dirname $p) p="$(dirname "$p")"
done done
# Files are strictly identical between the 2 passes (only mod or access times differs). No need for unused delta. # Files are strictly identical between the 2 passes (only mod or access times differs). No need for unused delta.
Echo_message "reduce_pass_size: '%s' is strictly identical between %s and %s. Removing." "$f" "$pass" "$parent" Echo_message "reduce_pass_size: '%s' is strictly identical between %s and %s. Removing." "$f" "$pass" "$parent"

3
live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
View File

@ -136,5 +136,8 @@ qemu-img convert -O vhdx "$raw_img" "$vhd_img"
rm "$raw_img" rm "$raw_img"
apt-get install -y zip apt-get install -y zip
create_manifest chroot "$vhd_img.zip.manifest"
zip "$vhd_img.zip" "$vhd_img" zip "$vhd_img.zip" "$vhd_img"
rm "$vhd_img" rm "$vhd_img"