diff options
| author | Elias Probst <mail@eliasprobst.eu> | 2016-02-26 20:35:09 +0100 |
|---|---|---|
| committer | Elias Probst <mail@eliasprobst.eu> | 2016-02-26 20:39:10 +0100 |
| commit | 7a8c9e4457b0fbfe13d29f54f4d786bb433fb4d3 (patch) | |
| tree | 9756678ca33b9caf2c80ca37ed008cb0774454c0 /units/systemd-nspawn@.service.in | |
| parent | Merge pull request #2671 from 0xAX/move-pager-open-to-one-place (diff) | |
| download | systemd-7a8c9e4457b0fbfe13d29f54f4d786bb433fb4d3.tar.xz systemd-7a8c9e4457b0fbfe13d29f54f4d786bb433fb4d3.zip | |
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.
Diffstat (limited to 'units/systemd-nspawn@.service.in')
| -rw-r--r-- | units/systemd-nspawn@.service.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in index eb10343ac6..1927c4d485 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 |