From: Elias Probst <mail@eliasprobst.eu>
Date: Fri, 26 Feb 2016 19:35:09 +0000 (+0100)
Subject: Don't escape the name of the container in instances of
X-Git-Tag: v230~301^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a8c9e4457b0fbfe13d29f54f4d786bb433fb4d3;p=thirdparty%2Fsystemd.git

Don't escape the name of the container in instances of

When using `%I` for instances of `systemd-nspawn@.service`, the result
will be `systemd-nspawn` trying to launch a container named e.g.
`fedora/23` instead of `fedora-23`.
Using `%i` instead prevents escaping `-` in a container name and uses
the unmodified container name from the machine store.
---

diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index eb10343ac61..1927c4d4853 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -6,14 +6,14 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Container %I
+Description=Container %i
 Documentation=man:systemd-nspawn(1)
 PartOf=machines.target
 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 --settings=override --machine=%i
 KillMode=mixed
 Type=notify
 RestartForceExitStatus=133