Merge lp:~mwhudson/livecd-rootfs/lp-1743643 into lp:livecd-rootfs

Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 1644
Proposed branch: lp:~mwhudson/livecd-rootfs/lp-1743643
Merge into: lp:livecd-rootfs
Diff against target: 28 lines (+11/-0)
2 files modified
debian/changelog (+7/-0)
live-build/ubuntu-server/hooks/032-installer-squashfs.binary (+4/-0)
To merge this branch: bzr merge lp:~mwhudson/livecd-rootfs/lp-1743643
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+341440@code.launchpad.net

Description of the change

This is obviously vile but is it too vile? See https://bugs.launchpad.net/subiquity/+bug/1743643

To post a comment you must log in.
Revision history for this message
Ryan Harper (raharper) wrote :

I'm +1 on this;

It could be useful to examine the original use-case for this feature; but generally it seems like a bad idea; if you don't have enough memory to run the live environment, swapping isn't going to give you a great experience and certainly going to cause issues when we swapoff and then trigger OOM.

Revision history for this message
Steve Langasek (vorlon) wrote :

Discussed with Michael on IRC various options that might be "cleaner" than removing a file belonging to a package, and none of them are so clean that I care to stand on ceremony - considering this bit of the casper code will only successfully run once at image build time, and the casper package will never be upgraded within the installer squashfs. +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2018-03-15 01:10:02 +0000
+++ debian/changelog 2018-03-15 07:28:30 +0000
@@ -1,3 +1,10 @@
1livecd-rootfs (2.511) UNRELEASED; urgency=medium
2
3 * In the live-server build, prevent casper from mounting any existing swap
4 partitions from drives we might later be installing to.
5
6 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 15 Mar 2018 20:23:27 +1300
7
1livecd-rootfs (2.510) bionic; urgency=medium8livecd-rootfs (2.510) bionic; urgency=medium
29
3 * Rename the directory containing the systemd override file for subiquity to10 * Rename the directory containing the systemd override file for subiquity to
411
=== modified file 'live-build/ubuntu-server/hooks/032-installer-squashfs.binary'
--- live-build/ubuntu-server/hooks/032-installer-squashfs.binary 2018-02-23 01:58:03 +0000
+++ live-build/ubuntu-server/hooks/032-installer-squashfs.binary 2018-03-15 07:28:30 +0000
@@ -53,6 +53,10 @@
53chroot $SQUASH_ROOT apt-get update53chroot $SQUASH_ROOT apt-get update
54chroot $SQUASH_ROOT apt-get -y install user-setup curtin lupin-casper54chroot $SQUASH_ROOT apt-get -y install user-setup curtin lupin-casper
5555
56# For bug #1743643 "Install to dirty disk with swap fails" remove the
57# "helpful" casper script that mounts any swap partitions it finds.
58rm -f $SQUASH_ROOT/usr/share/initramfs-tools/scripts/casper-bottom/*swap
59
56# Installing casper means we need a new initramfs60# Installing casper means we need a new initramfs
57UPDATE_INITRAMFS_OPTIONS=CASPER_GENERATE_UUID=1 recreate_initramfs $SQUASH_ROOT61UPDATE_INITRAMFS_OPTIONS=CASPER_GENERATE_UUID=1 recreate_initramfs $SQUASH_ROOT
5862

Subscribers

People subscribed via source and target branches