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

Import patches-unapplied version 2.504 to ubuntu/bionic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 43f65f0fffc562c6badfef03fbe5515ea7243478

New changelog entries:
  * 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)
This commit is contained in:
Michael Hudson-Doyle 2018-02-21 10:39:58 +13:00 committed by usd-importer
parent 43f65f0fff
commit 801938f00a
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.504) bionic; 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 <michael.hudson@ubuntu.com> Wed, 21 Feb 2018 10:39:58 +1300
livecd-rootfs (2.503) bionic; urgency=medium livecd-rootfs (2.503) bionic; urgency=medium
* Install linux-signed-generic in the live-server image. (LP: #1749065) * Install linux-signed-generic in the live-server image. (LP: #1749065)

12
live-build/ubuntu-server/hooks/032-installer-squashfs.binary
View File

@ -33,6 +33,18 @@ mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/"
setup_mountpoint binary/boot/squashfs.dir 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" <<EOF
[Unit]
JobRunningTimeoutSec=0s
EOF
# Prepare installer layer. # Prepare installer layer.
# Install any requirements for the installer, for things we don't want # Install any requirements for the installer, for things we don't want