From 8f084002eaf43e535f3697a31aeffb14946f9ab2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 3 Feb 2015 13:53:01 +0100 Subject: [PATCH] loopback-setup: simplify code a bit --- src/core/loopback-setup.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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; } -- 2.30.2