From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Apr 2016 12:12:27 +0000 (+0200)
Subject: units: turn on user namespace by default in systemd-nspawn@.service
X-Git-Tag: v230~129^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af88764ff8fb64ff0762b0efd8856439c3e77988;p=thirdparty%2Fsystemd.git

units: turn on user namespace by default in systemd-nspawn@.service

Now that user namespacing is supported in a pretty automatic way, actually turn
it on by default if the systemd-nspawn@.service template is used.
---

diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index 1927c4d4853..ea28941507d 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -13,7 +13,7 @@ Before=machines.target
 After=network.target
 
 [Service]
-ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i
+ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i
 KillMode=mixed
 Type=notify
 RestartForceExitStatus=133