Import patches-unapplied version 2.462 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 3f5115f8f2

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.
impish
Steve Langasek 7 years ago committed by usd-importer
parent 3f5115f8f2
commit 2da89c90de

12
debian/changelog vendored

@ -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 <steve.langasek@ubuntu.com> 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 <xnox@ubuntu.com> Thu, 28 Sep 2017 13:58:43 -0400
livecd-rootfs (2.460) artful; urgency=medium livecd-rootfs (2.460) artful; urgency=medium
[ Steve Langasek ] [ Steve Langasek ]

@ -62,7 +62,7 @@ install_grub() {
efi_boot_dir="/boot/efi/EFI/BOOT" efi_boot_dir="/boot/efi/EFI/BOOT"
chroot mountpoint mkdir -p "${efi_boot_dir}" 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 # FIXME: code duplicated between 032-disk-image.binary
# and 033-disk-image-uefi.binary. We want to fix this to not # and 033-disk-image-uefi.binary. We want to fix this to not
# have initramfs-tools installed at all on these images. # have initramfs-tools installed at all on these images.

@ -11,6 +11,7 @@ ConditionPathExists=!/run/subiquity/complete
Environment=PYTHONPATH=/usr/share/subiquity Environment=PYTHONPATH=/usr/share/subiquity
ExecStartPre=/bin/systemctl stop getty@tty1 ExecStartPre=/bin/systemctl stop getty@tty1
ExecStartPre=/bin/dmesg -n 1 ExecStartPre=/bin/dmesg -n 1
ExecStartPre=/usr/bin/subiquity-loadkeys
ExecStart=/sbin/agetty -n --noclear -l /snap/bin/subiquity tty1 $TERM ExecStart=/sbin/agetty -n --noclear -l /snap/bin/subiquity tty1 $TERM
ExecStopPost=/bin/systemctl start getty@tty1 ExecStopPost=/bin/systemctl start getty@tty1
Type=idle Type=idle

Loading…
Cancel
Save