Merge ~ubuntu-core-dev/grub/+git/ubuntu:fix-seabios-ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
Proposed by
Łukasz Zemczak
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 4791e5629bdbba87c63c52959f293bbec3e8aa23 | ||||
| Proposed branch: | ~ubuntu-core-dev/grub/+git/ubuntu:fix-seabios-ubuntu | ||||
| Merge into: | ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu | ||||
| Diff against target: |
529 lines (+114/-71) 31 files modified
debian/.git-dpm (+2/-2) debian/changelog (+9/-0) debian/patches/bootp_new_net_bootp6_command.patch (+2/-2) debian/patches/bootp_process_dhcpack_http_boot.patch (+1/-1) debian/patches/default_grub_d.patch (+1/-1) debian/patches/efinet_set_dns_from_uefi_proto.patch (+2/-2) debian/patches/efinet_set_network_from_uefi_devpath.patch (+1/-1) debian/patches/efinet_uefi_ipv6_pxe_support.patch (+2/-2) debian/patches/gfxpayload_dynamic.patch (+4/-4) debian/patches/grub-install-extra-removable.patch (+1/-1) debian/patches/grub-shell-test-helper-disable-seabios-sercon.patch (+33/-0) debian/patches/install_locale_langpack.patch (+1/-1) debian/patches/install_powerpc_machtypes.patch (+4/-4) debian/patches/install_signed.patch (+1/-1) debian/patches/linuxefi.patch (+2/-2) debian/patches/linuxefi_add_sb_to_efi_chainload.patch (+1/-1) debian/patches/linuxefi_fix_efi_validation_race.patch (+1/-1) debian/patches/linuxefi_handle_multiarch_boot.patch (+3/-3) debian/patches/linuxefi_honor_sb_mode.patch (+12/-12) debian/patches/linuxefi_load_arm_with_sb.patch (+5/-5) debian/patches/linuxefi_non_sb_fallback.patch (+1/-1) debian/patches/linuxefi_rework_linux16_cmd.patch (+1/-1) debian/patches/linuxefi_rework_non-sb_efi_chainload.patch (+4/-4) debian/patches/linuxefi_rework_pe_loading.patch (+2/-2) debian/patches/net_read_bracketed_ipv6_addr.patch (+3/-3) debian/patches/quick_boot.patch (+6/-6) debian/patches/restore_mkdevicemap.patch (+2/-2) debian/patches/series (+1/-0) debian/patches/syslinux-test-out-of-tree.patch (+2/-2) debian/patches/uefi_firmware_setup.patch (+2/-2) tests/util/grub-shell.in (+2/-2) |
||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Core Development Team | Pending | ||
|
Review via email:
|
|||
Commit message
In the grub-shell test helper, disable seabios's serial console through fw_cfg runtime configuration as its boot output interferes with testing.
Description of the change
In the grub-shell test helper, disable seabios's serial console through fw_cfg runtime configuration as its boot output interferes with testing.
Without this, grub2 FTBFS on i386 and amd64 (as only those use qemu+seabios).
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
