From d1b26ce330cc838d4f58f332791ed8737b45caae Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 20 Feb 2018 15:22:43 +1300 Subject: [PATCH] Override JobRunningTimeoutSec to 0s on the .device unit that subiquity_config.mount depends on to avoid a 5s delay on switching to a new VT when there is no device there (LP: #1750117) --- debian/changelog | 8 ++++++++ .../hooks/032-installer-squashfs.binary | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/debian/changelog b/debian/changelog index e7f7ebe7..1c769d40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.504) UNRELEASED; urgency=medium + + * Override JobRunningTimeoutSec to 0s on the .device unit that + subiquity_config.mount depends on to avoid a 5s delay on switching to a + new VT when there is no device there (LP: #1750117) + + -- Michael Hudson-Doyle Tue, 20 Feb 2018 12:57:07 +1300 + livecd-rootfs (2.503) bionic; urgency=medium * Install linux-signed-generic in the live-server image. (LP: #1749065) diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index 87c743dd..fe970005 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -33,6 +33,18 @@ mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/" setup_mountpoint binary/boot/squashfs.dir +# Override JobRunningTimeoutSec to 0s on the .device unit that +# subiquity_config.mount depends on to avoid a 5s delay on switching +# to a new VT when there is no device there (LP: #1750117). +# It would be better to have this in ../includes.binary/overlay but +# you can't have backslashes in filenames in bzr branches! +DEVICE_UNIT_NAME='dev-disk-by\x2duuid-00c629d6\x2d06ab\x2d4dfd\x2db21e\x2dc3186f34105d.device' +mkdir -p "$SQUASH_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d" +cat > "$SQUASH_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d/override.conf" <