From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Fri, 24 Jun 2011 11:43:19 +0000 (+0200)
Subject: swap: ignore missing /proc/swaps
X-Git-Tag: v30~145
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f8587327556c97ae4fc4c8b3ea0df122f769d4b;p=systemd

swap: ignore missing /proc/swaps

Otherwise systemd reports "Failed to fully start up daemon: No such file or
directory" when swap is disabled in the kernel.
---

diff --git a/src/swap.c b/src/swap.c
index 14719ad1..7675e6af 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -1237,7 +1237,7 @@ static int swap_enumerate(Manager *m) {
 
         if (!m->proc_swaps) {
                 if (!(m->proc_swaps = fopen("/proc/swaps", "re")))
-                        return -errno;
+                        return (errno == ENOENT) ? 0 : -errno;
 
                 m->swap_watch.type = WATCH_SWAP;
                 m->swap_watch.fd = fileno(m->proc_swaps);