[gentoo-commits] repo/gentoo:master commit in: sys-boot/efibootmgr/files/

[gentoo-commits] repo/gentoo:master commit in: sys-boot/efibootmgr/files/

[David Seifert]

commit:     42865ef46fc71b94b8e2289a06e131b4e7207d58
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 11 14:48:23 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:28:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42865ef4

sys-boot/efibootmgr: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/5390

 .../files/efibootmgr-error-reporting.patch         | 40 ----------------------
 1 file changed, 40 deletions(-)

diff --git a/sys-boot/efibootmgr/files/efibootmgr-error-reporting.patch b/sys-boot/efibootmgr/files/efibootmgr-error-reporting.patch
deleted file mode 100644
index 2c769db2304..00000000000
--- a/sys-boot/efibootmgr/files/efibootmgr-error-reporting.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-@@ -, +, @@ 
----
- src/lib/efivars_sysfs.c |   16 +++++++++++++---
- 1 files changed, 13 insertions(+), 3 deletions(-)
---- a/src/lib/efivars_sysfs.c	
-+++ a/src/lib/efivars_sysfs.c	
-@@ -66,6 +66,7 @@ static efi_status_t
- sysfs_write_variable(const char *filename, efi_variable_t *var)
- {
- 	int fd;
-+	int rc = EFI_SUCCESS;
- 	size_t writesize;
- 	char buffer[PATH_MAX+40];
- 
-@@ -77,12 +78,21 @@ sysfs_write_variable(const char *filename, efi_variable_t *var)
- 		return EFI_INVALID_PARAMETER;
- 	}
- 	writesize = write(fd, var, sizeof(*var));
-+	if (writesize == -1) {
-+		if (errno == -ENOSPC)
-+			rc = EFI_OUT_OF_RESOURCES;
-+		else
-+			rc = EFI_INVALID_PARAMETER;
-+		goto out;
-+	}
- 	if (writesize != sizeof(*var)) {
--		close(fd);
--		return EFI_INVALID_PARAMETER;
-+		rc = EFI_INVALID_PARAMETER;
- 	}
-+out:
-+	if (rc != EFI_SUCCESS)
-+		fprintf(stderr, "Failed to write variable: %s\n", strerror(errno));
- 	close(fd);
--	return EFI_SUCCESS;
-+	return rc;
- }
- 
- 
---