From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 15 Nov 2019 13:57:27 +0000 (+0100)
Subject: umount: be happy if /proc/swaps doesn't exist
X-Git-Tag: v244-rc1~43^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cdd0d612d18732db845f2f44f217d6e00c62010;p=thirdparty%2Fsystemd.git

umount: be happy if /proc/swaps doesn't exist

Kernels work without swap just fine.

Fixes: #13993
---

diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 4a96e1b7943..11be9466a58 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -184,6 +184,8 @@ int swap_list_get(const char *swaps, MountPoint **head) {
                 return log_oom();
 
         r = mnt_table_parse_swaps(t, swaps);
+        if (r == -ENOENT) /* no /proc/swaps is fine */
+                return 0;
         if (r < 0)
                 return log_error_errno(r, "Failed to parse %s: %m", swaps ?: "/proc/swaps");