From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 14 Mar 2015 02:21:46 +0000 (-0500)
Subject: core: print warning on invalid swap pri= field
X-Git-Tag: v219.0~330
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e64d523579dc6ed48db7ccdc5441c0adc33cd4e2;p=elogind.git

core: print warning on invalid swap pri= field

CID #1264371.
---

diff --git a/src/core/swap.c b/src/core/swap.c
index bb1398f68..6b1bdb5c1 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -724,8 +724,12 @@ static void swap_enter_activating(Swap *s) {
                                      NULL, &discard, NULL);
 
                 priority = s->parameters_fragment.priority;
-                if (priority < 0)
-                        fstab_find_pri(s->parameters_fragment.options, &priority);
+                if (priority < 0) {
+                        r = fstab_find_pri(s->parameters_fragment.options, &priority);
+                        if (r < 0)
+                                log_notice_errno(r, "Failed to parse swap priority \"%s\", ignoring: %m",
+                                                 s->parameters_fragment.options);
+                }
         }
 
         r = exec_command_set(s->control_command, "/sbin/swapon", NULL);