From 8b8e82850dc8818b97f8bafc3ccc7982142f1cea Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sat, 18 Apr 2020 14:28:23 -0500 Subject: [PATCH] app-emulation/qemu-guest-agent: fix shutdown command Closes: https://bugs.gentoo.org/681874 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matthias Maier --- .../files/qemu-guest-agent-4.2.0-fix-shutdown.patch | 11 +++++++++++ ...-4.2.0.ebuild => qemu-guest-agent-4.2.0-r1.ebuild} | 1 + 2 files changed, 12 insertions(+) create mode 100644 app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch rename app-emulation/qemu-guest-agent/{qemu-guest-agent-4.2.0.ebuild => qemu-guest-agent-4.2.0-r1.ebuild} (96%) diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch new file mode 100644 index 000000000000..f69781694f1d --- /dev/null +++ b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch @@ -0,0 +1,11 @@ +--- qemu-4.2.0/qga/commands-posix.c.orig 2020-03-23 11:15:05.972610989 +0300 ++++ qemu-4.2.0/qga/commands-posix.c 2020-03-23 11:15:39.676015087 +0300 +@@ -108,7 +108,7 @@ + reopen_fd_to_null(1); + reopen_fd_to_null(2); + +- execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", ++ execle("/sbin/shutdown", "shutdown", "-h", "now", shutdown_flag, "+0", + "hypervisor initiated shutdown", (char*)NULL, environ); + _exit(EXIT_FAILURE); + } else if (pid < 0) { diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild similarity index 96% rename from app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild rename to app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild index 27782cf6ca5a..c290b1251ca0 100644 --- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild +++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild @@ -29,6 +29,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-4.2.0-sysmacros.patch #580924 + "${FILESDIR}"/${PN}-4.2.0-fix-shutdown.patch #681874 ) src_configure() { -- 2.26.2