[systemd-commits] 2 commits - TODO src/core

[Lennart Poettering]

 TODO                      |    4 ++++
 src/core/loopback-setup.c |   15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 2aeed6760e9759d95418bdb2e80d0032ffcb768e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Feb 3 14:08:56 2015 +0100

    update TODO

diff --git a/TODO b/TODO
index 6fb748b..68727f8 100644
--- a/TODO
+++ b/TODO
@@ -34,6 +34,10 @@ External:
 
 Features:
 
+* networkd: implement BindCarrier= logic to .network units that binds
+  application of the file to the carrier sense on another interface,
+  in order to implement uplink/downlink logic.
+
 * make networkd subscribe to PrepareForSleep(false) and refresh all
   DHCP leases then.
 

commit 8f084002eaf43e535f3697a31aeffb14946f9ab2
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Feb 3 13:53:01 2015 +0100

    loopback-setup: simplify code a bit

diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index e5c0c0c..67ce160 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;
 }