X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fumount.c;h=95efa8204b2e9e9cb11e2cf07666d1556251354d;hp=96ce61da8b1c7d8362b00df10889a0451a241e33;hb=1968a360405e302d4d2c2abc03a3314f81375156;hpb=f3accc08d36c3937f6bc2e696679610dd36fbfaf

diff --git a/src/umount.c b/src/umount.c
index 96ce61da8..95efa8204 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -103,9 +103,7 @@ static int mount_points_list_get(MountPoint **head) {
 
                 /* If we encounter a bind mount, don't try to remount
                  * the source dir too early */
-                if (!streq(root, "/"))
-                        skip_ro = true;
-
+                skip_ro = !streq(root, "/");
                 free(root);
 
                 p = cunescape(path);
@@ -148,7 +146,7 @@ static int swap_list_get(MountPoint **head) {
         assert(head);
 
         if (!(proc_swaps = fopen("/proc/swaps", "re")))
-                return -errno;
+                return (errno == ENOENT) ? 0 : -errno;
 
         (void) fscanf(proc_swaps, "%*s %*s %*s %*s %*s\n");