From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 3 Feb 2015 12:53:01 +0000 (+0100)
Subject: loopback-setup: simplify code a bit
X-Git-Tag: v219~169
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8f084002eaf43e535f3697a31aeffb14946f9ab2

loopback-setup: simplify code a bit
---

diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index e5c0c0c1f..67ce160c1 100644
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -83,12 +83,17 @@ int loopback_setup(void) {
                 return r;
 
         r = start_loopback(rtnl);
-        if (r == -EPERM) {
-                if (!check_loopback(rtnl))
-                        return log_warning_errno(EPERM, "Failed to configure loopback device: %m");
-        } else if (r < 0)
-                return log_warning_errno(r, "Failed to configure loopback device: %m");
+        if (r < 0) {
+
+                /* If we lack the permissions to configure the
+                 * loopback device, but we find it to be already
+                 * configured, let's exit cleanly, in order to
+                 * supported unprivileged containers. */
+                if (r == -EPERM && check_loopback(rtnl))
+                        return 0;
 
+                return log_warning_errno(r, "Failed to configure loopback device: %m");
+        }
 
         return 0;
 }