mirror of
https://github.com/openwrt/packages.git
synced 2025-12-24 10:38:21 +04:00
e1d8f3c800
- Update version - Refresh patches - Remove unsupported config options: - `--enable-live-block-migration` - `--disable-pvrdma` Signed-off-by: Vladimir Ermakov <vooon341@gmail.com>
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 80ec6872aceb18c68b1cf5b6f8acd6ad667cbd4f Mon Sep 17 00:00:00 2001
|
|
From: Yousong Zhou <yszhou4tech@gmail.com>
|
|
Date: Thu, 17 Dec 2020 15:55:55 +0800
|
|
Subject: [PATCH] qga: invoke separate applets for guest-shutdown modes
|
|
|
|
/sbin/shutdown is not available on OpenWrt by default
|
|
|
|
Origin: "main/qemu: fix shutdown from guest agent"
|
|
https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf2df01c27790d
|
|
---
|
|
qga/commands-posix.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
--- a/qga/commands-posix.c
|
|
+++ b/qga/commands-posix.c
|
|
@@ -217,6 +217,7 @@ out:
|
|
void qmp_guest_shutdown(const char *mode, Error **errp)
|
|
{
|
|
const char *shutdown_flag;
|
|
+ const char *fallback_cmd = NULL;
|
|
Error *local_err = NULL;
|
|
|
|
#ifdef CONFIG_SOLARIS
|
|
@@ -236,10 +237,13 @@ void qmp_guest_shutdown(const char *mode
|
|
slog("guest-shutdown called, mode: %s", mode);
|
|
if (!mode || strcmp(mode, "powerdown") == 0) {
|
|
shutdown_flag = powerdown_flag;
|
|
+ fallback_cmd = "/sbin/poweroff";
|
|
} else if (strcmp(mode, "halt") == 0) {
|
|
shutdown_flag = halt_flag;
|
|
+ fallback_cmd = "/sbin/halt";
|
|
} else if (strcmp(mode, "reboot") == 0) {
|
|
shutdown_flag = reboot_flag;
|
|
+ fallback_cmd = "/sbin/reboot";
|
|
} else {
|
|
error_setg(errp,
|
|
"mode is invalid (valid values are: halt|powerdown|reboot");
|
|
@@ -258,8 +262,12 @@ void qmp_guest_shutdown(const char *mode
|
|
|
|
ga_run_command(argv, NULL, "shutdown", &local_err);
|
|
if (local_err) {
|
|
- error_propagate(errp, local_err);
|
|
- return;
|
|
+ const char fallback_argv[] = {fallback_cmd, (char *) NULL};
|
|
+ ga_run_command(fallback_argv, NULL, fallback_cmd, &local_err);
|
|
+ if (local_err) {
|
|
+ error_propagate(errp, local_err);
|
|
+ return;
|
|
+ }
|
|
}
|
|
|
|
/* succeeded */
|