]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Don't escape the name of the container in instances of 2752/head
authorElias Probst <mail@eliasprobst.eu>
Fri, 26 Feb 2016 19:35:09 +0000 (20:35 +0100)
committerElias Probst <mail@eliasprobst.eu>
Fri, 26 Feb 2016 19:39:10 +0000 (20:39 +0100)
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.

units/systemd-nspawn@.service.in

index eb10343ac61919773da196403c5176bfbce61c32..1927c4d485318a580bc191d44d5596c5cd8338ae 100644 (file)
@@ -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