commit 4c8bb41ddd0f29d5a7b721b15538f65c93ca24f4
Author: Jan Rękorajski <[email protected]>
Date: Tue Nov 19 22:37:35 2013 +0100
- fix hibernation to swapfile
- rel 5
hibernate-to-file.patch | 23 +++++++++++++++++++++++
systemd.spec | 4 +++-
2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/systemd.spec b/systemd.spec
index 25bfc82..60bc9a6 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@ Summary(pl.UTF-8): systemd - zarządca systemu i usług dla
Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are
incompatible/breaking changes very often)
Version: 208
-Release: 4
+Release: 5
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
@@ -59,6 +59,7 @@ Patch10: net-rename-revert.patch
Patch11: nss-in-rootlib.patch
Patch12: proc-hidepid.patch
Patch14: dont-hash-null-keys.patch
+Patch15: hibernate-to-file.patch
URL: http://www.freedesktop.org/wiki/Software/systemd
BuildRequires: acl-devel
BuildRequires: attr-devel
@@ -590,6 +591,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
%patch12 -p1
# possible cause of infinite loop inside systemd-login
#patch14 -p1
+%patch15 -p1
cp -p %{SOURCE2} src/systemd_booted.c
%build
diff --git a/hibernate-to-file.patch b/hibernate-to-file.patch
new file mode 100644
index 0000000..3ee6966
--- /dev/null
+++ b/hibernate-to-file.patch
@@ -0,0 +1,23 @@
+commit 0c6f1f4ea4980ff719979d36f10bd6ea3e464c02
+Author: Jan Janssen <[email protected]>
+Date: Thu Oct 31 17:22:03 2013 +0100
+
+ Make hibernation test work for swap files
+
+ Suspend to disk works for swap files too (even if it is located
+ on an ecrypted file system):
+ https://www.kernel.org/doc/Documentation/power/swsusp-and-swap-files.txt
+
+diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
+index d068bfc..2bb0493 100644
+--- a/src/shared/sleep-config.c
++++ b/src/shared/sleep-config.c
+@@ -206,7 +206,7 @@ static int hibernation_partition_size(size_t *size, size_t
*used) {
+ if (!d)
+ return -ENOMEM;
+
+- if (!streq(type, "partition")) {
++ if (!streq(type, "partition") && !streq(type, "file")) {
+ log_debug("Partition %s has type %s, ignoring.", d,
type);
+ continue;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/4c8bb41ddd0f29d5a7b721b15538f65c93ca24f4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
