Merge ~ubuntu-core-dev/grub/+git/ubuntu:fix-seabios-ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Łukasz Zemczak]

In the grub-shell test helper, disable seabios's serial console through fw_cfg runtime configuration as its boot output interferes with testing.

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).

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 32844ae..330ef7d 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-1696f83780575139eb0ad801a311c947028278f2
-1696f83780575139eb0ad801a311c947028278f2
+aebe41c9004522170f1c93568f4267566e370b61
+aebe41c9004522170f1c93568f4267566e370b61
 0992ffbac6a1b4c97c350d12e5301e0067daa0d6
 0992ffbac6a1b4c97c350d12e5301e0067daa0d6
 grub2_2.02.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 05270e1..e02ed3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grub2 (2.02-2ubuntu10) cosmic; urgency=medium
+
+  * debian/patches/grub-shell-test-helper-disable-seabios-sercon.patch: In the
+    grub-shell test helper, disable seabios's serial console through fw_cfg
+    runtime configuration as its boot output interferes with testing.
+    (LP: #1775249)
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Wed, 06 Jun 2018 01:03:26 +0200
+
 grub2 (2.02-2ubuntu9) cosmic; urgency=medium
 
   * debian/patches/add-an-auto-nvram-option-to-grub-install.patch: Add the
diff --git a/debian/patches/bootp_new_net_bootp6_command.patch b/debian/patches/bootp_new_net_bootp6_command.patch
index 82975bc..64665bd 100644
--- a/debian/patches/bootp_new_net_bootp6_command.patch
+++ b/debian/patches/bootp_new_net_bootp6_command.patch
@@ -11,8 +11,8 @@ Signed-off-by: Ken Lin <[e-mail]>
 
 Patch-Name: bootp_new_net_bootp6_command.patch
 ---
- grub-core/net/bootp.c | 908 +++++++++++++++++++++++++++++++++++++++++++++++++-
- grub-core/net/ip.c    |  39 +++
+ grub-core/net/bootp.c | 908 +++++++++++++++++++++++++++++++++++++++++-
+ grub-core/net/ip.c    |  39 ++
  include/grub/net.h    |  72 ++++
  3 files changed, 1018 insertions(+), 1 deletion(-)
 
diff --git a/debian/patches/bootp_process_dhcpack_http_boot.patch b/debian/patches/bootp_process_dhcpack_http_boot.patch
index 473329a..73ab005 100644
--- a/debian/patches/bootp_process_dhcpack_http_boot.patch
+++ b/debian/patches/bootp_process_dhcpack_http_boot.patch
@@ -19,7 +19,7 @@ Signed-off-by: Ken Lin <[e-mail]>
 
 Patch-Name: bootp_process_dhcpack_http_boot.patch
 ---
- grub-core/net/bootp.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ grub-core/net/bootp.c | 67 +++++++++++++++++++++++++++++++++++++++++--
  include/grub/net.h    |  1 +
  2 files changed, 66 insertions(+), 2 deletions(-)
 
diff --git a/debian/patches/default_grub_d.patch b/debian/patches/default_grub_d.patch
index f5e8102..e3b4ce6 100644
--- a/debian/patches/default_grub_d.patch
+++ b/debian/patches/default_grub_d.patch
@@ -9,7 +9,7 @@ Last-Update: 2014-01-28
 
 Patch-Name: default_grub_d.patch
 ---
- grub-core/osdep/unix/config.c | 114 ++++++++++++++++++++++++++++++++++--------
+ grub-core/osdep/unix/config.c | 114 +++++++++++++++++++++++++++-------
  util/grub-mkconfig.in         |   5 ++
  2 files changed, 98 insertions(+), 21 deletions(-)
 
diff --git a/debian/patches/efinet_set_dns_from_uefi_proto.patch b/debian/patches/efinet_set_dns_from_uefi_proto.patch
index 4b2fdfe..cb75f3f 100644
--- a/debian/patches/efinet_set_dns_from_uefi_proto.patch
+++ b/debian/patches/efinet_set_dns_from_uefi_proto.patch
@@ -30,8 +30,8 @@ Signed-off-by: Ken Lin <[e-mail]>
 
 Patch-Name: efinet_set_dns_from_uefi_proto.patch
 ---
- grub-core/net/drivers/efi/efinet.c | 163 +++++++++++++++++++++++++++++++++++++
- include/grub/efi/api.h             |  76 +++++++++++++++++
+ grub-core/net/drivers/efi/efinet.c | 163 +++++++++++++++++++++++++++++
+ include/grub/efi/api.h             |  76 ++++++++++++++
  2 files changed, 239 insertions(+)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
diff --git a/debian/patches/efinet_set_network_from_uefi_devpath.patch b/debian/patches/efinet_set_network_from_uefi_devpath.patch
index ca47cca..c9e17e4 100644
--- a/debian/patches/efinet_set_network_from_uefi_devpath.patch
+++ b/debian/patches/efinet_set_network_from_uefi_devpath.patch
@@ -29,7 +29,7 @@ Signed-off-by: Ken Lin <[e-mail]>
 
 Patch-Name: efinet_set_network_from_uefi_devpath.patch
 ---
- grub-core/net/drivers/efi/efinet.c | 268 +++++++++++++++++++++++++++++++++++--
+ grub-core/net/drivers/efi/efinet.c | 268 ++++++++++++++++++++++++++++-
  include/grub/efi/api.h             |  11 ++
  2 files changed, 270 insertions(+), 9 deletions(-)
 
diff --git a/debian/patches/efinet_uefi_ipv6_pxe_support.patch b/debian/patches/efinet_uefi_ipv6_pxe_support.patch
index 3ff75c2..e7dca37 100644
--- a/debian/patches/efinet_uefi_ipv6_pxe_support.patch
+++ b/debian/patches/efinet_uefi_ipv6_pxe_support.patch
@@ -12,8 +12,8 @@ Signed-off-by: Ken Lin <[e-mail]>
 
 Patch-Name: efinet_uefi_ipv6_pxe_support.patch
 ---
- grub-core/net/drivers/efi/efinet.c | 24 +++++++++++++----
- include/grub/efi/api.h             | 55 +++++++++++++++++++++++++++++++++++++-
+ grub-core/net/drivers/efi/efinet.c | 24 ++++++++++---
+ include/grub/efi/api.h             | 55 +++++++++++++++++++++++++++++-
  2 files changed, 73 insertions(+), 6 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
diff --git a/debian/patches/gfxpayload_dynamic.patch b/debian/patches/gfxpayload_dynamic.patch
index e47dfde..f5f70e1 100644
--- a/debian/patches/gfxpayload_dynamic.patch
+++ b/debian/patches/gfxpayload_dynamic.patch
@@ -13,10 +13,10 @@ Last-Update: 2013-12-25
 
 Patch-Name: gfxpayload_dynamic.patch
 ---
- configure.ac                         |  11 +++
- grub-core/Makefile.core.def          |   9 +++
- grub-core/commands/i386/pc/hwmatch.c | 146 +++++++++++++++++++++++++++++++++++
- util/grub.d/10_linux.in              |  37 ++++++++-
+ configure.ac                         |  11 ++
+ grub-core/Makefile.core.def          |   9 ++
+ grub-core/commands/i386/pc/hwmatch.c | 146 +++++++++++++++++++++++++++
+ util/grub.d/10_linux.in              |  37 ++++++-
  4 files changed, 200 insertions(+), 3 deletions(-)
  create mode 100644 grub-core/commands/i386/pc/hwmatch.c
 
diff --git a/debian/patches/grub-install-extra-removable.patch b/debian/patches/grub-install-extra-removable.patch
index 38c5bba..341f93e 100644
--- a/debian/patches/grub-install-extra-removable.patch
+++ b/debian/patches/grub-install-extra-removable.patch
@@ -18,7 +18,7 @@ Last-Update: 2014-12-20
 
 Patch-Name: grub-install-extra-removable.patch
 ---
- util/grub-install.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ util/grub-install.c | 125 +++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 123 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
diff --git a/debian/patches/grub-shell-test-helper-disable-seabios-sercon.patch b/debian/patches/grub-shell-test-helper-disable-seabios-sercon.patch
new file mode 100644
index 0000000..cfa5946
--- /dev/null
+++ b/debian/patches/grub-shell-test-helper-disable-seabios-sercon.patch
@@ -0,0 +1,33 @@
+From aebe41c9004522170f1c93568f4267566e370b61 Mon Sep 17 00:00:00 2001
+From: Łukasz 'sil2100' Zemczak <[e-mail]>
+Date: Wed, 6 Jun 2018 00:55:46 +0200
+Subject: In the grub-shell test helper, disable seabios's serial console
+ through fw_cfg runtime configuration as it's boot output interferes with
+ testing.
+
+---
+ tests/util/grub-shell.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
+index 814f36c6b..8e1e86bb0 100644
+--- a/tests/util/grub-shell.in
++++ b/tests/util/grub-shell.in
+@@ -474,7 +474,7 @@ if [ x$boot = xnet ]; then
+     cp "${cfgfile}" "$netdir/boot/grub/grub.cfg"
+     cp "${source}" "$netdir/boot/grub/testcase.cfg"
+     [ -z "$files" ] || copy_extra_files "$netdir" $files
+-    timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext"  -net nic  | cat | tr -d "\r" | do_trim
++    timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -fw_cfg name=etc/sercon-port,string=0 -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext"  -net nic  | cat | tr -d "\r" | do_trim
+ elif [ x$boot = xemu ]; then
+     rootdir="$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX")"
+     grubdir="$rootdir/boot/grub"
+@@ -497,7 +497,7 @@ elif [ x$boot = xemu ]; then
+     test -n "$debug" || rm -rf "$rootdir"
+     test -n "$debug" || rm -f "$roottar"
+ else
+-    timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | do_trim
++    timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -fw_cfg name=etc/sercon-port,string=0 -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | do_trim
+ fi
+ if [ x$boot = xcoreboot ]; then
+     test -n "$debug" || rm -f "${imgfile}"
diff --git a/debian/patches/install_locale_langpack.patch b/debian/patches/install_locale_langpack.patch
index 2b2a868..93abe0c 100644
--- a/debian/patches/install_locale_langpack.patch
+++ b/debian/patches/install_locale_langpack.patch
@@ -9,7 +9,7 @@ Last-Update: 2013-12-25
 
 Patch-Name: install_locale_langpack.patch
 ---
- util/grub-install-common.c | 40 +++++++++++++++++++++++++++++++++-------
+ util/grub-install-common.c | 40 +++++++++++++++++++++++++++++++-------
  1 file changed, 33 insertions(+), 7 deletions(-)
 
 diff --git a/util/grub-install-common.c b/util/grub-install-common.c
diff --git a/debian/patches/install_powerpc_machtypes.patch b/debian/patches/install_powerpc_machtypes.patch
index 9618f9b..fef2d56 100644
--- a/debian/patches/install_powerpc_machtypes.patch
+++ b/debian/patches/install_powerpc_machtypes.patch
@@ -17,11 +17,11 @@ Last-Update: 2014-10-15
 Patch-Name: install_powerpc_machtypes.patch
 ---
  grub-core/osdep/basic/platform.c   |  5 +++
- grub-core/osdep/linux/platform.c   | 72 ++++++++++++++++++++++++++++++++++++++
- grub-core/osdep/unix/platform.c    | 28 +++++++++++----
- grub-core/osdep/windows/platform.c |  6 ++++
+ grub-core/osdep/linux/platform.c   | 72 ++++++++++++++++++++++++++++++
+ grub-core/osdep/unix/platform.c    | 28 +++++++++---
+ grub-core/osdep/windows/platform.c |  6 +++
  include/grub/util/install.h        |  3 ++
- util/grub-install.c                | 11 ++++++
+ util/grub-install.c                | 11 +++++
  6 files changed, 119 insertions(+), 6 deletions(-)
 
 diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c
diff --git a/debian/patches/install_signed.patch b/debian/patches/install_signed.patch
index a7b5397..e79ff52 100644
--- a/debian/patches/install_signed.patch
+++ b/debian/patches/install_signed.patch
@@ -15,7 +15,7 @@ Last-Update: 2016-11-01
 
 Patch-Name: install_signed.patch
 ---
- util/grub-install.c | 195 +++++++++++++++++++++++++++++++++++++++-------------
+ util/grub-install.c | 195 +++++++++++++++++++++++++++++++++-----------
  1 file changed, 148 insertions(+), 47 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
diff --git a/debian/patches/linuxefi.patch b/debian/patches/linuxefi.patch
index f5b4460..bc46b54 100644
--- a/debian/patches/linuxefi.patch
+++ b/debian/patches/linuxefi.patch
@@ -10,8 +10,8 @@ Last-Update: 2017-11-01
 Patch-Name: linuxefi.patch
 ---
  grub-core/Makefile.core.def       |   8 +
- grub-core/kern/efi/mm.c           |  32 ++++
- grub-core/loader/i386/efi/linux.c | 371 ++++++++++++++++++++++++++++++++++++++
+ grub-core/kern/efi/mm.c           |  32 +++
+ grub-core/loader/i386/efi/linux.c | 371 ++++++++++++++++++++++++++++++
  include/grub/efi/efi.h            |   3 +
  include/grub/i386/linux.h         |   1 +
  5 files changed, 415 insertions(+)
diff --git a/debian/patches/linuxefi_add_sb_to_efi_chainload.patch b/debian/patches/linuxefi_add_sb_to_efi_chainload.patch
index 7557cd8..6261249 100644
--- a/debian/patches/linuxefi_add_sb_to_efi_chainload.patch
+++ b/debian/patches/linuxefi_add_sb_to_efi_chainload.patch
@@ -24,7 +24,7 @@ Last-Update: 2017-11-01
 Patch-Name: linuxefi_add_sb_to_efi_chainload.patch
 ---
  grub-core/Makefile.core.def        |   1 +
- grub-core/loader/efi/chainloader.c | 612 ++++++++++++++++++++++++++++++++++---
+ grub-core/loader/efi/chainloader.c | 612 +++++++++++++++++++++++++++--
  include/grub/efi/pe32.h            |  20 +-
  3 files changed, 596 insertions(+), 37 deletions(-)
 
diff --git a/debian/patches/linuxefi_fix_efi_validation_race.patch b/debian/patches/linuxefi_fix_efi_validation_race.patch
index 028f18e..447fc12 100644
--- a/debian/patches/linuxefi_fix_efi_validation_race.patch
+++ b/debian/patches/linuxefi_fix_efi_validation_race.patch
@@ -9,7 +9,7 @@ Last-Update: 2017-11-01
 
 Patch-Name: linuxefi_fix_efi_validation_race.patch
 ---
- grub-core/loader/i386/efi/linux.c | 44 ++++++++++-----------------------------
+ grub-core/loader/i386/efi/linux.c | 44 ++++++++-----------------------
  1 file changed, 11 insertions(+), 33 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
diff --git a/debian/patches/linuxefi_handle_multiarch_boot.patch b/debian/patches/linuxefi_handle_multiarch_boot.patch
index 3f07c16..0930864 100644
--- a/debian/patches/linuxefi_handle_multiarch_boot.patch
+++ b/debian/patches/linuxefi_handle_multiarch_boot.patch
@@ -13,9 +13,9 @@ Last-Update: 2017-11-01
 
 Patch-Name: linuxefi_handle_multiarch_boot.patch
 ---
- grub-core/loader/efi/linux.c      |   9 +++-
- grub-core/loader/i386/efi/linux.c | 108 ++++++++++++++++++++++++++------------
- include/grub/i386/linux.h         |   7 ++-
+ grub-core/loader/efi/linux.c      |   9 ++-
+ grub-core/loader/i386/efi/linux.c | 108 +++++++++++++++++++++---------
+ include/grub/i386/linux.h         |   7 +-
  3 files changed, 88 insertions(+), 36 deletions(-)
 
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
diff --git a/debian/patches/linuxefi_honor_sb_mode.patch b/debian/patches/linuxefi_honor_sb_mode.patch
index 128e4df..fab527c 100644
--- a/debian/patches/linuxefi_honor_sb_mode.patch
+++ b/debian/patches/linuxefi_honor_sb_mode.patch
@@ -16,23 +16,23 @@ Patch-Name: linuxefi_honor_sb_mode.patch
 ---
  grub-core/Makefile.am              |  1 +
  grub-core/Makefile.core.def        |  1 +
- grub-core/commands/iorw.c          |  7 +++++
- grub-core/commands/memrw.c         |  7 +++++
+ grub-core/commands/iorw.c          |  7 ++++
+ grub-core/commands/memrw.c         |  7 ++++
  grub-core/kern/dl.c                |  1 +
- grub-core/kern/efi/efi.c           | 28 ------------------
- grub-core/kern/efi/sb.c            | 58 ++++++++++++++++++++++++++++++++++++++
- grub-core/loader/efi/appleloader.c |  7 +++++
+ grub-core/kern/efi/efi.c           | 28 ---------------
+ grub-core/kern/efi/sb.c            | 58 ++++++++++++++++++++++++++++++
+ grub-core/loader/efi/appleloader.c |  7 ++++
  grub-core/loader/efi/chainloader.c |  1 +
- grub-core/loader/i386/bsd.c        |  7 +++++
- grub-core/loader/i386/linux.c      |  7 +++++
- grub-core/loader/i386/pc/linux.c   |  7 +++++
- grub-core/loader/multiboot.c       |  7 +++++
- grub-core/loader/xnu.c             |  7 +++++
+ grub-core/loader/i386/bsd.c        |  7 ++++
+ grub-core/loader/i386/linux.c      |  7 ++++
+ grub-core/loader/i386/pc/linux.c   |  7 ++++
+ grub-core/loader/multiboot.c       |  7 ++++
+ grub-core/loader/xnu.c             |  7 ++++
  include/grub/efi/efi.h             |  1 -
- include/grub/efi/sb.h              | 29 +++++++++++++++++++
+ include/grub/efi/sb.h              | 29 +++++++++++++++
  include/grub/ia64/linux.h          |  0
  include/grub/mips/linux.h          |  0
- include/grub/powerpc/linux.h       | 22 +++++++++++++++
+ include/grub/powerpc/linux.h       | 22 ++++++++++++
  include/grub/sparc64/linux.h       |  0
  20 files changed, 169 insertions(+), 29 deletions(-)
  create mode 100644 grub-core/kern/efi/sb.c
diff --git a/debian/patches/linuxefi_load_arm_with_sb.patch b/debian/patches/linuxefi_load_arm_with_sb.patch
index 96a79b7..54fbe54 100644
--- a/debian/patches/linuxefi_load_arm_with_sb.patch
+++ b/debian/patches/linuxefi_load_arm_with_sb.patch
@@ -17,11 +17,11 @@ Patch-Name: linuxefi_load_arm_with_sb.patch
 ---
  grub-core/Makefile.core.def       |   3 +
  grub-core/loader/arm/linux.c      |   1 +
- grub-core/loader/arm64/linux.c    | 119 ++++++++++++++++++++------------------
- grub-core/loader/efi/linux.c      |  65 +++++++++++++++++++++
- grub-core/loader/i386/efi/linux.c |  39 +------------
- include/grub/arm64/linux.h        |   7 +++
- include/grub/efi/linux.h          |  31 ++++++++++
+ grub-core/loader/arm64/linux.c    | 119 ++++++++++++++++--------------
+ grub-core/loader/efi/linux.c      |  65 ++++++++++++++++
+ grub-core/loader/i386/efi/linux.c |  39 +---------
+ include/grub/arm64/linux.h        |   7 ++
+ include/grub/efi/linux.h          |  31 ++++++++
  7 files changed, 174 insertions(+), 91 deletions(-)
  create mode 100644 grub-core/loader/efi/linux.c
  create mode 100644 include/grub/efi/linux.h
diff --git a/debian/patches/linuxefi_non_sb_fallback.patch b/debian/patches/linuxefi_non_sb_fallback.patch
index 3e7c686..73df218 100644
--- a/debian/patches/linuxefi_non_sb_fallback.patch
+++ b/debian/patches/linuxefi_non_sb_fallback.patch
@@ -10,7 +10,7 @@ Last-Update: 2017-11-01
 Patch-Name: linuxefi_non_sb_fallback.patch
 ---
  grub-core/loader/i386/efi/linux.c |  2 +-
- grub-core/loader/i386/linux.c     | 43 +++++++++++++++++++++++++++++++++++++++
+ grub-core/loader/i386/linux.c     | 43 +++++++++++++++++++++++++++++++
  2 files changed, 44 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
diff --git a/debian/patches/linuxefi_rework_linux16_cmd.patch b/debian/patches/linuxefi_rework_linux16_cmd.patch
index 4c22a18..2205e94 100644
--- a/debian/patches/linuxefi_rework_linux16_cmd.patch
+++ b/debian/patches/linuxefi_rework_linux16_cmd.patch
@@ -13,7 +13,7 @@ Last-Update: 2017-11-01
 
 Patch-Name: linuxefi_rework_linux16_cmd.patch
 ---
- grub-core/loader/i386/pc/linux.c | 34 +++++++++++++++++++++-------------
+ grub-core/loader/i386/pc/linux.c | 34 ++++++++++++++++++++------------
  1 file changed, 21 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
diff --git a/debian/patches/linuxefi_rework_non-sb_efi_chainload.patch b/debian/patches/linuxefi_rework_non-sb_efi_chainload.patch
index 894832e..00cf6dd 100644
--- a/debian/patches/linuxefi_rework_non-sb_efi_chainload.patch
+++ b/debian/patches/linuxefi_rework_non-sb_efi_chainload.patch
@@ -47,11 +47,11 @@ Last-Update: 2017-11-01
 
 Patch-Name: linuxefi_rework_non-sb_efi_chainload.patch
 ---
- grub-core/kern/efi/sb.c            |  14 +++--
+ grub-core/kern/efi/sb.c            |  14 +++-
  grub-core/loader/arm64/linux.c     |   4 +-
- grub-core/loader/efi/chainloader.c | 115 ++++++++++++++++++++++---------------
- grub-core/loader/efi/linux.c       |  13 +++--
- grub-core/loader/i386/efi/linux.c  |   7 ++-
+ grub-core/loader/efi/chainloader.c | 115 ++++++++++++++++++-----------
+ grub-core/loader/efi/linux.c       |  13 ++--
+ grub-core/loader/i386/efi/linux.c  |   7 +-
  include/grub/efi/linux.h           |   2 +-
  6 files changed, 97 insertions(+), 58 deletions(-)
 
diff --git a/debian/patches/linuxefi_rework_pe_loading.patch b/debian/patches/linuxefi_rework_pe_loading.patch
index 8bc36e4..37acdee 100644
--- a/debian/patches/linuxefi_rework_pe_loading.patch
+++ b/debian/patches/linuxefi_rework_pe_loading.patch
@@ -13,8 +13,8 @@ Last-Update: 2017-11-01
 
 Patch-Name: linuxefi_rework_pe_loading.patch
 ---
- grub-core/loader/efi/chainloader.c | 156 +++++++++++++++++++++++++++++--------
- include/grub/efi/pe32.h            |  32 +++++++-
+ grub-core/loader/efi/chainloader.c | 156 +++++++++++++++++++++++------
+ include/grub/efi/pe32.h            |  32 +++++-
  2 files changed, 152 insertions(+), 36 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
diff --git a/debian/patches/net_read_bracketed_ipv6_addr.patch b/debian/patches/net_read_bracketed_ipv6_addr.patch
index aa061d3..cdfadc2 100644
--- a/debian/patches/net_read_bracketed_ipv6_addr.patch
+++ b/debian/patches/net_read_bracketed_ipv6_addr.patch
@@ -9,9 +9,9 @@ number
 
 Patch-Name: net_read_bracketed_ipv6_addr.patch
 ---
- grub-core/net/http.c | 21 +++++++++---
- grub-core/net/net.c  | 93 ++++++++++++++++++++++++++++++++++++++++++++++++----
- grub-core/net/tftp.c |  6 +++-
+ grub-core/net/http.c | 21 ++++++++--
+ grub-core/net/net.c  | 93 +++++++++++++++++++++++++++++++++++++++++---
+ grub-core/net/tftp.c |  6 ++-
  include/grub/net.h   |  1 +
  4 files changed, 110 insertions(+), 11 deletions(-)
 
diff --git a/debian/patches/quick_boot.patch b/debian/patches/quick_boot.patch
index 48f6076..f04887d 100644
--- a/debian/patches/quick_boot.patch
+++ b/debian/patches/quick_boot.patch
@@ -23,13 +23,13 @@ Last-Update: 2015-09-04
 
 Patch-Name: quick_boot.patch
 ---
- configure.ac                | 11 +++++++
- docs/grub.texi              | 14 +++++++++
- grub-core/normal/menu.c     | 24 ++++++++++++++
+ configure.ac                | 11 ++++++
+ docs/grub.texi              | 14 +++++++
+ grub-core/normal/menu.c     | 24 ++++++++++++
  util/grub-mkconfig.in       |  3 +-
- util/grub.d/00_header.in    | 77 ++++++++++++++++++++++++++++++++++++++-------
- util/grub.d/10_linux.in     |  4 +++
- util/grub.d/30_os-prober.in | 21 +++++++++++++
+ util/grub.d/00_header.in    | 77 +++++++++++++++++++++++++++++++------
+ util/grub.d/10_linux.in     |  4 ++
+ util/grub.d/30_os-prober.in | 21 ++++++++++
  7 files changed, 141 insertions(+), 13 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
diff --git a/debian/patches/restore_mkdevicemap.patch b/debian/patches/restore_mkdevicemap.patch
index 3337939..cfca403 100644
--- a/debian/patches/restore_mkdevicemap.patch
+++ b/debian/patches/restore_mkdevicemap.patch
@@ -17,9 +17,9 @@ Patch-Name: restore_mkdevicemap.patch
  Makefile.util.def              |   17 +
  docs/man/grub-mkdevicemap.h2m  |    4 +
  include/grub/util/deviceiter.h |   14 +
- util/deviceiter.c              | 1021 ++++++++++++++++++++++++++++++++++++++++
+ util/deviceiter.c              | 1021 ++++++++++++++++++++++++++++++++
  util/devicemap.c               |   13 +
- util/grub-mkdevicemap.c        |  181 +++++++
+ util/grub-mkdevicemap.c        |  181 ++++++
  6 files changed, 1250 insertions(+)
  create mode 100644 docs/man/grub-mkdevicemap.h2m
  create mode 100644 include/grub/util/deviceiter.h
diff --git a/debian/patches/series b/debian/patches/series
index 298e3f0..b90a19b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -76,3 +76,4 @@ shorter_version_info.patch
 skip_text_gfxpayload_where_not_supported.patch
 yylex-explicitly_cast_fprintf_to_void.patch
 add-an-auto-nvram-option-to-grub-install.patch
+grub-shell-test-helper-disable-seabios-sercon.patch
diff --git a/debian/patches/syslinux-test-out-of-tree.patch b/debian/patches/syslinux-test-out-of-tree.patch
index 7f0e389..9c34f49 100644
--- a/debian/patches/syslinux-test-out-of-tree.patch
+++ b/debian/patches/syslinux-test-out-of-tree.patch
@@ -19,8 +19,8 @@ Last-Update: 2016-09-19
 Patch-Name: syslinux-test-out-of-tree.patch
 ---
  Makefile.am                            |  6 ------
- tests/syslinux/ubuntu10.04_grub.cfg.in | 30 +++++++++++++++---------------
- tests/syslinux_test.in                 | 14 ++++++++++----
+ tests/syslinux/ubuntu10.04_grub.cfg.in | 30 +++++++++++++-------------
+ tests/syslinux_test.in                 | 14 ++++++++----
  3 files changed, 25 insertions(+), 25 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
diff --git a/debian/patches/uefi_firmware_setup.patch b/debian/patches/uefi_firmware_setup.patch
index 8ffc301..50f0581 100644
--- a/debian/patches/uefi_firmware_setup.patch
+++ b/debian/patches/uefi_firmware_setup.patch
@@ -8,8 +8,8 @@ Last-Update: 2015-09-04
 
 Patch-Name: uefi_firmware_setup.patch
 ---
- Makefile.util.def               |  6 ++++++
- util/grub.d/30_uefi-firmware.in | 46 +++++++++++++++++++++++++++++++++++++++++
+ Makefile.util.def               |  6 +++++
+ util/grub.d/30_uefi-firmware.in | 46 +++++++++++++++++++++++++++++++++
  2 files changed, 52 insertions(+)
  create mode 100644 util/grub.d/30_uefi-firmware.in
 
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 814f36c..8e1e86b 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -474,7 +474,7 @@ if [ x$boot = xnet ]; then
     cp "${cfgfile}" "$netdir/boot/grub/grub.cfg"
     cp "${source}" "$netdir/boot/grub/testcase.cfg"
     [ -z "$files" ] || copy_extra_files "$netdir" $files
-    timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext"  -net nic  | cat | tr -d "\r" | do_trim
+    timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -fw_cfg name=etc/sercon-port,string=0 -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext"  -net nic  | cat | tr -d "\r" | do_trim
 elif [ x$boot = xemu ]; then
     rootdir="$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX")"
     grubdir="$rootdir/boot/grub"
@@ -497,7 +497,7 @@ elif [ x$boot = xemu ]; then
     test -n "$debug" || rm -rf "$rootdir"
     test -n "$debug" || rm -f "$roottar"
 else
-    timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | do_trim
+    timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -fw_cfg name=etc/sercon-port,string=0 -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | do_trim
 fi
 if [ x$boot = xcoreboot ]; then
     test -n "$debug" || rm -f "${imgfile}"