From abfea5773a658c1da3390b6155bc9d8486e66a10 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 11 Apr 2018 14:20:27 +0200 Subject: [PATCH] Import patches-unapplied version 2.521 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: 71b98bc5dfbd93634097a46c56672528481fbf2a New changelog entries: * In subiquity image, mount additional squashfs in /media. * Make lzma initramfs compression opt-in rather than opt-out, and do not opt-in to it for live-server builds to speed up the boot. (LP: #1750873) --- debian/changelog | 13 +++++++++++++ live-build/auto/config | 10 +++++++--- .../local-fs.target.wants/media-filesystem.mount | 1 + .../local-fs.target.wants/media-rack.lower.mount | 1 + .../system/local-fs.target.wants/media-rack.mount | 1 + .../local-fs.target.wants/media-region.lower.mount | 1 + .../system/local-fs.target.wants/media-region.mount | 1 + .../lib/systemd/system/media-filesystem.mount | 5 +++++ .../lib/systemd/system/media-rack.lower.mount | 5 +++++ .../overlay/lib/systemd/system/media-rack.mount | 9 +++++++++ .../lib/systemd/system/media-region.lower.mount | 5 +++++ .../overlay/lib/systemd/system/media-region.mount | 10 ++++++++++ 12 files changed, 59 insertions(+), 3 deletions(-) create mode 120000 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-filesystem.mount create mode 120000 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount create mode 120000 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.mount create mode 120000 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.lower.mount create mode 120000 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.mount create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.lower.mount create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.lower.mount create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount diff --git a/debian/changelog b/debian/changelog index f96bf01f..bb0893d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +livecd-rootfs (2.521) bionic; urgency=medium + + * In subiquity image, mount additional squashfs in /media. + + -- Dimitri John Ledkov Wed, 11 Apr 2018 14:20:27 +0200 + +livecd-rootfs (2.520) bionic; urgency=medium + + * Make lzma initramfs compression opt-in rather than opt-out, and do not + opt-in to it for live-server builds to speed up the boot. (LP: #1750873) + + -- Michael Hudson-Doyle Wed, 11 Apr 2018 19:15:49 +1200 + livecd-rootfs (2.519) bionic; urgency=medium [ Robert C Jennings ] diff --git a/live-build/auto/config b/live-build/auto/config index e21a736d..e07aeb85 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -322,6 +322,12 @@ if ! [ -e config/germinate-output/structure ]; then ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH) fi +case $PROJECT in + base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|lubuntu-next|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu) + INITRAMFS_COMPRESSION="lzma" + ;; +esac + case $PROJECT in ubuntu|ubuntu-dvd) add_task install minimal standard ubuntu-desktop @@ -559,7 +565,6 @@ case $PROJECT in ;; esac OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" - INITRAMFS_COMPRESSION="none" # contains the framework definition add_package install ubuntu-core-libs @@ -655,7 +660,6 @@ case $PROJECT in OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" - INITRAMFS_COMPRESSION="gzip" ;; *) @@ -823,7 +827,7 @@ lb config noauto \ ${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \ --initsystem none \ --bootloader "$BOOTLOADER" \ - --initramfs-compression "${INITRAMFS_COMPRESSION:-lzma}" \ + ${INITRAMFS_COMPRESSION:+--initramfs-compression "$INITRAMFS_COMPRESSION"} \ --cache false \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ $OPTS \ diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-filesystem.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-filesystem.mount new file mode 120000 index 00000000..0a663081 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-filesystem.mount @@ -0,0 +1 @@ +../media-filesystem.mount \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount new file mode 120000 index 00000000..5aa5c72d --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount @@ -0,0 +1 @@ +../media-rack.lower.mount \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.mount new file mode 120000 index 00000000..35236752 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.mount @@ -0,0 +1 @@ +../media-rack.mount \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.lower.mount new file mode 120000 index 00000000..6a2b1af4 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.lower.mount @@ -0,0 +1 @@ +../media-region.lower.mount \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.mount new file mode 120000 index 00000000..f4a748da --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.mount @@ -0,0 +1 @@ +../media-region.mount \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount new file mode 100644 index 00000000..13fe2e1f --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount @@ -0,0 +1,5 @@ +[Mount] +What=/cdrom/casper/filesystem.squashfs +Where=/media/filesystem +Type=squashfs +Options=ro diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.lower.mount new file mode 100644 index 00000000..8d1079f8 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.lower.mount @@ -0,0 +1,5 @@ +[Mount] +What=/cdrom/casper/maas/maas-rack.squashfs +Where=/media/rack.lower +Type=squashfs +Options=ro diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount new file mode 100644 index 00000000..90de99d5 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount @@ -0,0 +1,9 @@ +[Unit] +After=media-filesystem.mount +After=media-rack.lower.mount + +[Mount] +What=overlay +Where=/media/rack +Type=overlay +Options=lowerdir=/media/rack.lower:/media/filesystem diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.lower.mount new file mode 100644 index 00000000..ee220c0d --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.lower.mount @@ -0,0 +1,5 @@ +[Mount] +What=/cdrom/casper/maas/maas-region.squashfs +Where=/media/region.lower +Type=squashfs +Options=ro diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount new file mode 100644 index 00000000..7a52efff --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount @@ -0,0 +1,10 @@ +[Unit] +After=media-filesystem.mount +After=media-rack.lower.mount +After=media-region.lower.mount + +[Mount] +What=overlay +Where=/media/region +Type=overlay +Options=lowerdir=/media/region.lower:/media/rack.lower:/media/filesystem