]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sleep: no need to check for resume_offset twice
authorLennart Poettering <lennart@poettering.net>
Wed, 24 Oct 2018 10:57:37 +0000 (12:57 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 24 Oct 2018 10:57:37 +0000 (12:57 +0200)
The W_OK check already checks for existance hence let's remove the F_OK
check.

src/sleep/sleep.c

index 771a8cd48bd6faf83b3ea05c395ebcf461b9967e..eeaf8d8972d8dde7c33591023f0c988008f260f9 100644 (file)
@@ -54,15 +54,14 @@ static int write_hibernate_location_info(void) {
         }
 
         /* Only available in 4.17+ */
-        if (access("/sys/power/resume_offset", F_OK) < 0) {
-                if (errno == ENOENT)
+        if (access("/sys/power/resume_offset", W_OK) < 0) {
+                if (errno == ENOENT) {
+                        log_debug("Kernel too old, can't configure resume offset, ignoring.");
                         return 0;
+                }
 
-                return log_debug_errno(errno, "/sys/power/resume_offset unavailable: %m");
-        }
-
-        if (access("/sys/power/resume_offset", W_OK) < 0)
                 return log_debug_errno(errno, "/sys/power/resume_offset not writeable: %m");
+        }
 
         fd = open(device, O_RDONLY | O_CLOEXEC | O_NONBLOCK);
         if (fd < 0)