Attachment 582911 Details for Bug 856389

[patch] systemd-sleep check for resume parameters on command line

1023-systemd-sleep-checkresume.patch (text/plain), 2.14 KB, created by Thomas Blume on 2014-03-20 08:31:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Blume

Created: 2014-03-20 08:31:35 UTC

Size: 2.14 KB

patch

obsolete

>--- orig/sleep-config.c	2014-03-17 13:18:42.844196108 +0100
>+++ mod/sleep-config.c	2014-03-20 09:19:40.508140036 +0100
>@@ -133,6 +133,47 @@
>         return false;
> }
> 
>+static int parse_proc_cmdline_resume() {
>+        _cleanup_free_ char *line = NULL;
>+        char *w, *state;
>+        size_t l;
>+        int r;
>+        
>+        r = proc_cmdline(&line);
>+        if (r < 0)
>+                log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
>+        if (r <= 0)
>+                return 0;
>+
>+        if (strstr(line, "resume=")) {
>+                FOREACH_WORD_QUOTED(w, l, line, state) {
>+                        _cleanup_free_ char *word;
>+                        word = strndup(w, l);
>+
>+                        if (startswith(word, "resume=")) {
>+                                struct stat s;
>+                                const char *path = word + 7;
>+
>+                                if (stat(path,&s) == 0) {
>+                                        if (S_ISBLK(s.st_mode)) {
>+                                                return 0;
>+                                        } else if (S_ISREG(s.st_mode)) {
>+                                                if (strstr(line, "resume_offset="))
>+                                                        return 0;
>+                                                else 
>+                                                        return -1;
>+                                        } else { 
>+                                                return -1;
>+                                        } 
>+                                }
>+                        }
>+                }
>+                return 0;
>+        } else {
>+                return -1;
>+        }
>+}
>+        
> int can_sleep_disk(char **types) {
>         char *w, *state, **type;
>         int r;
>@@ -145,6 +186,10 @@
>         if (access("/sys/power/disk", W_OK) < 0)
>                 return false;
> 
>+        /* check for resume parameters on command line */
>+        if (parse_proc_cmdline_resume() < 0) 
>+                return false;
>+
>         r = read_one_line_file("/sys/power/disk", &p);
>         if (r < 0)
>                 return false;

Actions: View | Diff

Attachments on bug 856389: 572622 | 582827 | 582911 | 583604