[systemd-commits] 2 commits - units/systemd-networkd.socket units/systemd-nspawn at .service.in

[Lennart Poettering]

 units/systemd-networkd.socket    |    1 +
 units/systemd-nspawn at .service.in |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7d5fed66a6fd5731da7564ae47a9f693fa75a549
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Feb 13 14:35:50 2015 +0100

    units: turn on --network-veth by default for systemd-nspawn at .service
    
    Given the recent improvements in networkd, it's probably the better
    default now.

diff --git a/units/systemd-nspawn at .service.in b/units/systemd-nspawn at .service.in
index 02d663d..3e26b53 100644
--- a/units/systemd-nspawn at .service.in
+++ b/units/systemd-nspawn at .service.in
@@ -12,7 +12,7 @@ PartOf=machines.target
 Before=machines.target
 
 [Service]
-ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --machine=%I
+ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --machine=%I
 KillMode=mixed
 Type=notify
 RestartForceExitStatus=133

commit 93391a8badc671f7d1a163b4b338bc030c390cb7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Feb 13 14:30:05 2015 +0100

    units: fix systemd-networkd.service in containers lacking CAP_NET_ADMIN

diff --git a/units/systemd-networkd.socket b/units/systemd-networkd.socket
index d15ee9e..8cd7bab 100644
--- a/units/systemd-networkd.socket
+++ b/units/systemd-networkd.socket
@@ -8,6 +8,7 @@
 [Unit]
 Description=networkd rtnetlink socket
 Documentation=man:systemd-networkd.service(8) man:rtnetlink(7)
+ConditionCapability=CAP_NET_ADMIN
 DefaultDependencies=no
 Before=sockets.target