X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Floopback-setup.c;h=63b15c12009e345ee9343151841ca2a2dd1c8f22;hb=df823e23f04da832ad5fc078176f8c26597a9845;hp=e5c0c0c1f5a7a227bcfa909645e855cd989324ff;hpb=9ca903cceb9b0c9148e3050e800b3f422ab6aab8;p=elogind.git
diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index e5c0c0c1f..63b15c120 100644
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -19,18 +19,10 @@
along with systemd; If not, see .
***/
-#include
#include
-#include
-#include
-#include
#include
-#include
#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;
}