From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 5 Sep 2015 23:32:27 +0000 (+0200)
Subject: units: make sure that .nspawn files override the default settings in systemd-nspawn... 
X-Git-Tag: v226~19^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08acb521f30d692f13056daa23fb1323528249ff;p=thirdparty%2Fsystemd.git

units: make sure that .nspawn files override the default settings in systemd-nspawn@.service
---

diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index 074b916d386..6b86e0a7f77 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 --machine=%I
+ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%I
 KillMode=mixed
 Type=notify
 RestartForceExitStatus=133