From d7e1e723986fe1d558ab6a47125b6d8414a12068 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 21 Mar 2018 15:58:02 +1300 Subject: [PATCH] Import patches-unapplied version 2.513 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: 2be32c140c18f9592ef85f3afa4d740587ceccbb New changelog entries: * In the live-server build, prevent casper from mounting any existing swap partitions from drives we might later be installing to. (LP: #1743643) --- debian/changelog | 8 ++++++++ .../ubuntu-server/hooks/032-installer-squashfs.binary | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index f0d0def6..b6c93731 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.513) bionic; urgency=medium + + * In the live-server build, prevent casper from mounting any existing + swap partitions from drives we might later be installing to. + (LP: #1743643) + + -- Michael Hudson-Doyle Wed, 21 Mar 2018 15:58:02 +1300 + livecd-rootfs (2.512) bionic; urgency=medium * ubuntu-cpc: When performing a minimized build, don't generate artifacts diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index a0b77a20..bab6ab76 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -53,6 +53,10 @@ EOF chroot $SQUASH_ROOT apt-get update chroot $SQUASH_ROOT apt-get -y install user-setup curtin lupin-casper +# For bug #1743643 "Install to dirty disk with swap fails" remove the +# "helpful" casper script that mounts any swap partitions it finds. +rm -f $SQUASH_ROOT/usr/share/initramfs-tools/scripts/casper-bottom/*swap + # Installing casper means we need a new initramfs UPDATE_INITRAMFS_OPTIONS=CASPER_GENERATE_UUID=1 recreate_initramfs $SQUASH_ROOT