From 2da89c90de5e4df541d301cf14819278b3be7df9 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 29 Sep 2017 15:10:47 -0400 Subject: [PATCH] Import patches-unapplied version 2.462 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: 3f5115f8f2963d72f56fe6c65666122d462f1369 New changelog entries: * Fix a reference to an undefined variable in a script that's set -u. * In subiquity, loadkeys to setup Shift+Tab key combination. --- debian/changelog | 12 ++++++++++++ .../ubuntu-cpc/hooks/033-disk-image-uefi.binary | 2 +- .../overlay/lib/systemd/system/subiquity.service | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3c0481d4..750cd292 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +livecd-rootfs (2.462) artful; urgency=medium + + * Fix a reference to an undefined variable in a script that's set -u. + + -- Steve Langasek Fri, 29 Sep 2017 15:10:47 -0400 + +livecd-rootfs (2.461) artful; urgency=medium + + * In subiquity, loadkeys to setup Shift+Tab key combination. + + -- Dimitri John Ledkov Thu, 28 Sep 2017 13:58:43 -0400 + livecd-rootfs (2.460) artful; urgency=medium [ Steve Langasek ] diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary index 5827a6fe..4782f6df 100755 --- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary @@ -62,7 +62,7 @@ install_grub() { efi_boot_dir="/boot/efi/EFI/BOOT" chroot mountpoint mkdir -p "${efi_boot_dir}" - if [ "$SUBPROJECT" = minimize ] && [ -n "$partuuid" ]; then + if [ "${SUBPROJECT:-}" = minimize ] && [ -n "$partuuid" ]; then # FIXME: code duplicated between 032-disk-image.binary # and 033-disk-image-uefi.binary. We want to fix this to not # have initramfs-tools installed at all on these images. diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service index e241d307..3c446898 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service @@ -11,6 +11,7 @@ ConditionPathExists=!/run/subiquity/complete Environment=PYTHONPATH=/usr/share/subiquity ExecStartPre=/bin/systemctl stop getty@tty1 ExecStartPre=/bin/dmesg -n 1 +ExecStartPre=/usr/bin/subiquity-loadkeys ExecStart=/sbin/agetty -n --noclear -l /snap/bin/subiquity tty1 $TERM ExecStopPost=/bin/systemctl start getty@tty1 Type=idle