Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-08-16 03:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.408.22 to ubuntu/xenial-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 09a02366158f903528da1e2c083407c75a2f7a18

New changelog entries:
  * Make sure to remove any initramfs that was generated in a minimized
    image.
  * divert /usr/bin/systemd-detect-virt as part of the grub diversions, so
    that the grub kernel postinst hook is operational when we're building
    in a container.  LP: #1729034.
This commit is contained in:
Steve Langasek 2017-10-21 20:53:02 -07:00 committed by usd-importer
parent 09a0236615
commit 118c6476a9
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.408.22) xenial; urgency=medium
* Make sure to remove any initramfs that was generated in a minimized
image.
* divert /usr/bin/systemd-detect-virt as part of the grub diversions, so
that the grub kernel postinst hook is operational when we're building
in a container. LP: #1729034.
-- Steve Langasek <steve.langasek@ubuntu.com> Sat, 21 Oct 2017 20:53:02 -0700
livecd-rootfs (2.408.21) xenial; urgency=medium livecd-rootfs (2.408.21) xenial; urgency=medium
[ Balint Reczey ] [ Balint Reczey ]

8
live-build/auto/build
View File

@ -158,6 +158,14 @@ EOF
lb chroot "$@" lb chroot "$@"
if [ "${SUBPROJECT:-}" = minimized ]; then
# and if initramfs-tools was configured before our kernel,
# /etc/kernel/postinst.d/initramfs-tools will have created
# an initramfs despite the generic dpkg-divert; so remove it
# here.
rm -f chroot/boot/initrd.img-*
fi
if [ -f config/oem-config-preinstalled ]; then if [ -f config/oem-config-preinstalled ]; then
# This is cargo-culted almost verbatim (with some syntax changes for # This is cargo-culted almost verbatim (with some syntax changes for

13
live-build/ubuntu-cpc/functions
View File

@ -298,6 +298,15 @@ divert_grub() {
chroot "$CHROOT_ROOT" dpkg-divert --local \ chroot "$CHROOT_ROOT" dpkg-divert --local \
--divert /etc/grub.d/30_os-prober.dpkg-divert \ --divert /etc/grub.d/30_os-prober.dpkg-divert \
--rename /etc/grub.d/30_os-prober --rename /etc/grub.d/30_os-prober
# Divert systemd-detect-virt; /etc/kernel/postinst.d/zz-update-grub
# no-ops if we are in a container, and the launchpad farm runs builds
# in lxd. We therefore pretend that we're never in a container (by
# exiting 1).
chroot "$CHROOT_ROOT" dpkg-divert --local \
--rename /usr/bin/systemd-detect-virt
echo "exit 1" > "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
chmod +x "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
} }
undivert_grub() { undivert_grub() {
@ -310,4 +319,8 @@ undivert_grub() {
chroot "$CHROOT_ROOT" dpkg-divert --remove --local \ chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
--divert /etc/grub.d/30_os-prober.dpkg-divert \ --divert /etc/grub.d/30_os-prober.dpkg-divert \
--rename /etc/grub.d/30_os-prober --rename /etc/grub.d/30_os-prober
rm "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
--rename /usr/bin/systemd-detect-virt
} }