Imported 2.525.10

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2018-11-30 10:47:06 +00:00
parent 22f738130d
commit 7e8036822d
4 changed files with 22 additions and 1 deletions

14
debian/changelog vendored
View File

@ -1,3 +1,17 @@
livecd-rootfs (2.525.10) bionic; urgency=medium
[ Cody Shepherd ]
* Include grub efi packages in manifests for uefi images.
(LP: #1805190)
[ Robert C Jennings ]
* Disable checksum generation. (LP: #1799773)
[Steve Langasek]
* Fix Vcs-Bzr link.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 26 Nov 2018 12:55:11 -0800
livecd-rootfs (2.525.9) bionic; urgency=medium
* Ensure /lib/modules exists in root tarballs and sqashfs.

2
debian/control vendored
View File

@ -4,7 +4,7 @@ Priority: optional
Build-Depends: debhelper (>= 7)
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Standards-Version: 3.9.6
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
Vcs-Bzr: lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed/
Package: livecd-rootfs
Architecture: any

View File

@ -839,6 +839,7 @@ lb config noauto \
--initsystem none \
--bootloader "$BOOTLOADER" \
${INITRAMFS_COMPRESSION:+--initramfs-compression "$INITRAMFS_COMPRESSION"} \
--checksums none \
--cache false \
${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
$OPTS \

View File

@ -93,6 +93,12 @@ install_grub() {
;;
esac
# This call to populate the package manifest is added here to capture
# grub-efi packages that otherwise would not make it into the base
# manifest. filesystem.packages is moved into place via symlinking to
# livecd.ubuntu-cpc.manifest by live-build/auto/build after lb_binary runs
dpkg-query --show --admindir="mountpoint/var/lib/dpkg" > "binary/boot/filesystem.packages"
chroot mountpoint grub-install "${loop_device}" \
--boot-directory=/boot \
--efi-directory=/boot/efi \