From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 23 Dec 2012 20:58:37 +0000 (+0100)
Subject: util: if /sys mounted read-only we can't suspend/hibernate
X-Git-Tag: v197~94
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=679b7d791241eb52e15e4914e0d5709f67ff5123;p=elogind.git

util: if /sys mounted read-only we can't suspend/hibernate
---

diff --git a/src/shared/util.c b/src/shared/util.c
index 59d8544d0..1779625c7 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5282,9 +5282,13 @@ int can_sleep(const char *type) {
 
         assert(type);
 
+        /* If /sys is read-only we cannot sleep */
+        if (access("/sys/power/state", W_OK) < 0)
+                return false;
+
         r = read_one_line_file("/sys/power/state", &p);
         if (r < 0)
-                return r == -ENOENT ? 0 : r;
+                return false;
 
         k = strlen(type);
         FOREACH_WORD_SEPARATOR(w, l, p, WHITESPACE, state)
@@ -5302,9 +5306,14 @@ int can_sleep_disk(const char *type) {
 
         assert(type);
 
+        /* If /sys is read-only we cannot sleep */
+        if (access("/sys/power/state", W_OK) < 0 ||
+            access("/sys/power/disk", W_OK) < 0)
+                return false;
+
         r = read_one_line_file("/sys/power/disk", &p);
         if (r < 0)
-                return r == -ENOENT ? 0 : r;
+                return false;
 
         k = strlen(type);
         FOREACH_WORD_SEPARATOR(w, l, p, WHITESPACE, state) {