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

Imported 2.570

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2019-03-18 11:26:07 +00:00
parent 9a31a9b77f
commit 32197adbd7
4 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
debian/changelog vendored
View File

@ -1,3 +1,20 @@
livecd-rootfs (2.570) disco; urgency=medium
[ Jean-Baptiste Lallement ]
* Fix grub divert for multilayer images:
grub-probe must not be called during image build so grub is diverted. In
multilayer image the chroot is always the tip of the filesystem, so we
divert grub at the beginning of each pass and undivdert it as the end.
For flat images, it's diverted just before building the chroot and
undiverted after.
[ Didier Roche ]
* Ensure default langpacks are removed after installation:
Add langpacks to live tasks to have them in the ubiquity diff file and
thus, purged after installation if not selected. (LP: #1818890)
-- Didier Roche <didrocks@ubuntu.com> Mon, 18 Mar 2019 09:58:56 +0100
livecd-rootfs (2.569) disco; urgency=medium livecd-rootfs (2.569) disco; urgency=medium
* Drop /etc/update-motd.d/51-cloudguest from cloud images; this is not * Drop /etc/update-motd.d/51-cloudguest from cloud images; this is not

4
live-build/auto/build
View File

@ -261,14 +261,14 @@ EOF
chmod +x chroot/usr/bin/man chmod +x chroot/usr/bin/man
fi fi
divert_grub chroot
if [ -n "${PASSES}" ]; then if [ -n "${PASSES}" ]; then
PATH="config/:$PATH" lb chroot_layered "$@" PATH="config/:$PATH" lb chroot_layered "$@"
else else
divert_grub chroot
divert_update_initramfs divert_update_initramfs
lb chroot "$@" lb chroot "$@"
fi
undivert_grub chroot undivert_grub chroot
fi
# Let all configuration non multi-layered project here. # Let all configuration non multi-layered project here.
# If those are moving to a multi-layer layout, this needs to be # If those are moving to a multi-layer layout, this needs to be

3
live-build/auto/config
View File

@ -539,7 +539,8 @@ case $PROJECT in
;; ;;
*) *)
LIVE_TASK='ubuntu-live' LIVE_TASK='ubuntu-live'
add_task install minimal standard ubuntu-desktop ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages add_task install minimal standard ubuntu-desktop
add_task $LIVE_TASK ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
case $ARCH in case $ARCH in
amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac esac

7
live-build/lb_chroot_layered
View File

@ -175,6 +175,10 @@ create_chroot_pass () {
lb chroot_devpts install ${*} lb chroot_devpts install ${*}
lb chroot_proc install ${*} lb chroot_proc install ${*}
lb chroot_sysfs install ${*} lb chroot_sysfs install ${*}
# grub-probe should not be called as part of an image build so divert it
divert_grub chroot
# We run chroot_hacks only on root layers (update-initramfs diverted) # We run chroot_hacks only on root layers (update-initramfs diverted)
if $(is_root_layer $pass); then if $(is_root_layer $pass); then
divert_update_initramfs divert_update_initramfs
@ -245,6 +249,9 @@ create_chroot_pass () {
Chroot chroot "dpkg-query -W" > chroot.packages.${pass} Chroot chroot "dpkg-query -W" > chroot.packages.${pass}
# Restore grub
undivert_grub chroot
# Deconfiguring chroot # Deconfiguring chroot
if $(is_root_layer $pass); then if $(is_root_layer $pass); then
lb chroot_archives chroot remove ${*} lb chroot_archives chroot remove ${*}