mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 02:46:28 +00:00
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
diff -Naur a/qga/commands-posix.c b/qga/commands-posix.c
|
|
--- a/qga/commands-posix.c
|
|
+++ b/qga/commands-posix.c
|
|
@@ -109,6 +109,8 @@
|
|
reopen_fd_to_null(1);
|
|
reopen_fd_to_null(2);
|
|
|
|
+ execle("/run/current-system/sw/bin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
|
|
+ "hypervisor initiated shutdown", (char*)NULL, environ);
|
|
execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
|
|
"hypervisor initiated shutdown", (char*)NULL, environ);
|
|
_exit(EXIT_FAILURE);
|
|
@@ -157,11 +159,13 @@
|
|
pid_t pid;
|
|
Error *local_err = NULL;
|
|
struct timeval tv;
|
|
+ static const char hwclock_path_nix[] = "/run/current-system/sw/bin/hwclock";
|
|
static const char hwclock_path[] = "/sbin/hwclock";
|
|
static int hwclock_available = -1;
|
|
|
|
if (hwclock_available < 0) {
|
|
- hwclock_available = (access(hwclock_path, X_OK) == 0);
|
|
+ hwclock_available = (access(hwclock_path_nix, X_OK) == 0) ||
|
|
+ (access(hwclock_path, X_OK) == 0);
|
|
}
|
|
|
|
if (!hwclock_available) {
|
|
@@ -207,6 +211,8 @@
|
|
|
|
/* Use '/sbin/hwclock -w' to set RTC from the system time,
|
|
* or '/sbin/hwclock -s' to set the system time from RTC. */
|
|
+ execle(hwclock_path_nix, "hwclock", has_time ? "-w" : "-s",
|
|
+ NULL, environ);
|
|
execle(hwclock_path, "hwclock", has_time ? "-w" : "-s",
|
|
NULL, environ);
|
|
_exit(EXIT_FAILURE);
|