summaryrefslogtreecommitdiffstats
path: root/source/a/grub/grub.e75fdee420a7ad95e9a465c9699adc2e2e970440.terminate.efi.several.times.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/a/grub/grub.e75fdee420a7ad95e9a465c9699adc2e2e970440.terminate.efi.several.times.diff
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-20180528191229.tar.gz
current-20180528191229.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/grub/grub.e75fdee420a7ad95e9a465c9699adc2e2e970440.terminate.efi.several.times.diff')
-rw-r--r--source/a/grub/grub.e75fdee420a7ad95e9a465c9699adc2e2e970440.terminate.efi.several.times.diff75
1 files changed, 0 insertions, 75 deletions
diff --git a/source/a/grub/grub.e75fdee420a7ad95e9a465c9699adc2e2e970440.terminate.efi.several.times.diff b/source/a/grub/grub.e75fdee420a7ad95e9a465c9699adc2e2e970440.terminate.efi.several.times.diff
deleted file mode 100644
index d45528488..000000000
--- a/source/a/grub/grub.e75fdee420a7ad95e9a465c9699adc2e2e970440.terminate.efi.several.times.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-From e75fdee420a7ad95e9a465c9699adc2e2e970440 Mon Sep 17 00:00:00 2001
-From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
-Date: Tue, 26 Mar 2013 10:34:56 +0000
-Subject: * grub-core/kern/efi/mm.c (grub_efi_finish_boot_services):
-
- Try terminating EFI services several times due to quirks in some
- implementations.
----
-(limited to 'grub-core/kern/efi/mm.c')
-
-diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 351317b..77c9384 100644
---- a/grub-core/kern/efi/mm.c
-+++ b/grub-core/kern/efi/mm.c
-@@ -160,27 +160,41 @@ grub_efi_finish_boot_services (grub_efi_uintn_t *outbuf_size, void *outbuf,
- apple, sizeof (apple)) == 0);
- #endif
-
-- if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key,
-- &finish_desc_size, &finish_desc_version) < 0)
-- return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map");
-+ while (1)
-+ {
-+ if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key,
-+ &finish_desc_size, &finish_desc_version) < 0)
-+ return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map");
-
-- if (outbuf && *outbuf_size < finish_mmap_size)
-- return grub_error (GRUB_ERR_IO, "memory map buffer is too small");
-+ if (outbuf && *outbuf_size < finish_mmap_size)
-+ return grub_error (GRUB_ERR_IO, "memory map buffer is too small");
-
-- finish_mmap_buf = grub_malloc (finish_mmap_size);
-- if (!finish_mmap_buf)
-- return grub_errno;
-+ finish_mmap_buf = grub_malloc (finish_mmap_size);
-+ if (!finish_mmap_buf)
-+ return grub_errno;
-
-- if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key,
-- &finish_desc_size, &finish_desc_version) <= 0)
-- return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map");
-+ if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key,
-+ &finish_desc_size, &finish_desc_version) <= 0)
-+ {
-+ grub_free (finish_mmap_buf);
-+ return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map");
-+ }
-
-- b = grub_efi_system_table->boot_services;
-- status = efi_call_2 (b->exit_boot_services, grub_efi_image_handle,
-- finish_key);
-- if (status != GRUB_EFI_SUCCESS)
-- return grub_error (GRUB_ERR_IO, "couldn't terminate EFI services");
-+ b = grub_efi_system_table->boot_services;
-+ status = efi_call_2 (b->exit_boot_services, grub_efi_image_handle,
-+ finish_key);
-+ if (status == GRUB_EFI_SUCCESS)
-+ break;
-
-+ if (status != GRUB_EFI_INVALID_PARAMETER)
-+ {
-+ grub_free (finish_mmap_buf);
-+ return grub_error (GRUB_ERR_IO, "couldn't terminate EFI services");
-+ }
-+
-+ grub_free (finish_mmap_buf);
-+ grub_printf ("Trying to terminate EFI services again\n");
-+ }
- grub_efi_is_finished = 1;
- if (outbuf_size)
- *outbuf_size = finish_mmap_size;
---
-cgit v0.9.0.2
-