Frederic Crozat
37527bb454
- version 206 , highlights: * Unit files now understand the new %v specifier which resolves to the kernel version string as returned by "uname-r". * "journalctl -b" may now be used to look for boot output of a specific boot. Try "journalctl -b -1" * Creation of "dead" device nodes has been moved from udev into kmod and tmpfiles. * The udev "keymap" data files and tools to apply keyboard specific mappings of scan to key codes, and force-release scan code lists have been entirely replaced by a udev "keyboard" builtin and a hwdb data file. - remove patches now in upstream - systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 - systemd now require the kmod tool in addition to the library. - version 206 , highlights: * Unit files now understand the new %v specifier which resolves to the kernel version string as returned by "uname-r". * "journalctl -b" may now be used to look for boot output of a specific boot. Try "journalctl -b -1" * Creation of "dead" device nodes has been moved from udev into kmod and tmpfiles. * The udev "keymap" data files and tools to apply keyboard specific mappings of scan to key codes, and force-release scan code lists have been entirely replaced by a udev "keyboard" builtin and a hwdb data file. - remove patches now in upstream - systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 - systemd now require the kmod tool in addition to the library. (forwarded request 184035 from elvigia) OBS-URL: https://build.opensuse.org/request/show/184036 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=416
95 lines
2.7 KiB
Diff
95 lines
2.7 KiB
Diff
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Tue, 19 Feb 2013 11:20:31 +0100
|
|
Subject: Forward suspend / hibernate calls to pm-utils
|
|
|
|
forward suspend/hibernation calls to pm-utils, if installed (bnc#790157)
|
|
---
|
|
src/sleep/sleep.c | 26 ++++++++++++++++++++++----
|
|
1 file changed, 22 insertions(+), 4 deletions(-)
|
|
|
|
--- systemd-206.orig/src/sleep/sleep.c
|
|
+++ systemd-206/src/sleep/sleep.c
|
|
@@ -24,6 +24,7 @@
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <getopt.h>
|
|
+#include <stdlib.h>
|
|
|
|
#include "systemd/sd-id128.h"
|
|
#include "systemd/sd-messages.h"
|
|
@@ -35,6 +36,8 @@
|
|
#include "sleep-config.h"
|
|
|
|
static char* arg_verb = NULL;
|
|
+static bool delegate_to_pmutils = false;
|
|
+static const char *pmtools;
|
|
|
|
static int write_mode(char **modes) {
|
|
int r = 0;
|
|
@@ -50,9 +53,6 @@ static int write_mode(char **modes) {
|
|
r = k;
|
|
}
|
|
|
|
- if (r < 0)
|
|
- log_error("Failed to write mode to /sys/power/disk: %s",
|
|
- strerror(-r));
|
|
|
|
return r;
|
|
}
|
|
@@ -90,6 +90,8 @@ static int execute(char **modes, char **
|
|
FILE *f;
|
|
const char* note = strappenda("SLEEP=", arg_verb);
|
|
|
|
+ if (!delegate_to_pmutils) {
|
|
+
|
|
/* This file is opened first, so that if we hit an error,
|
|
* we can abort before modyfing any state. */
|
|
f = fopen("/sys/power/state", "we");
|
|
@@ -102,6 +104,7 @@ static int execute(char **modes, char **
|
|
r = write_mode(modes);
|
|
if (r < 0)
|
|
return r;
|
|
+ }
|
|
|
|
arguments[0] = NULL;
|
|
arguments[1] = (char*) "pre";
|
|
@@ -114,8 +117,10 @@ static int execute(char **modes, char **
|
|
"MESSAGE=Suspending system...",
|
|
note,
|
|
NULL);
|
|
-
|
|
+ if (!delegate_to_pmutils)
|
|
r = write_state(f, states);
|
|
+ else
|
|
+ r = -system(pmtools);
|
|
if (r < 0)
|
|
return r;
|
|
|
|
@@ -158,6 +163,7 @@ static int parse_argv(int argc, char *ar
|
|
};
|
|
|
|
int c;
|
|
+ struct stat buf;
|
|
|
|
assert(argc >= 0);
|
|
assert(argv);
|
|
@@ -196,6 +202,18 @@ static int parse_argv(int argc, char *ar
|
|
return -EINVAL;
|
|
}
|
|
|
|
+ if (streq(arg_verb, "suspend")) {
|
|
+ pmtools = "/usr/sbin/pm-suspend";
|
|
+ }
|
|
+ else if (streq(arg_verb, "hibernate") || streq(arg_verb, "hybrid-sleep")) {
|
|
+ if (streq(arg_verb, "hibernate"))
|
|
+ pmtools = "/usr/sbin/pm-hibernate";
|
|
+ else
|
|
+ pmtools = "/usr/sbin/pm-suspend-hybrid";
|
|
+ }
|
|
+
|
|
+ delegate_to_pmutils = (stat(pmtools, &buf) >= 0 && S_ISREG(buf.st_mode) && (buf.st_mode & 0111));
|
|
+
|
|
return 1 /* work to do */;
|
|
}
|
|
|