core: do not use quotes around virt and arch

[elogind.git] / src / core / loopback-setup.c

diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index e5c0c0c1f5a7a227bcfa909645e855cd989324ff..63b15c12009e345ee9343151841ca2a2dd1c8f22 100644 (file)
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -19,18 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/socket.h>
 #include <net/if.h>
-#include <asm/types.h>
-#include <netinet/in.h>
-#include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include "sd-rtnl.h"
-#include "util.h"
-#include "macro.h"
-#include "socket-util.h"
 #include "rtnl-util.h"
 #include "missing.h"
 #include "loopback-setup.h"
@@ -83,12 +75,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;
 }