diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-18 11:54:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-18 11:54:34 -0500 |
| commit | 581a07f9f0e32923f42aaccf58d11cd96f0d95f1 (patch) | |
| tree | 9b574c0844f643cf482fa8a2bad09f6d4eff5d4a /units | |
| parent | cc39016131a535382ca6bc4c5eb018ff7643ed83 (diff) | |
| parent | dec718065b59babdbc502e87149c310a7a297172 (diff) | |
Merge pull request #5369 from poettering/nspawn-resolved
fixes for running nspawn+resolved in combination
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-nspawn@.service.in | 2 | ||||
| -rw-r--r-- | units/systemd-resolved.service.m4.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in index e8d1fff7ab..8c0685aef5 100644 --- a/units/systemd-nspawn@.service.in +++ b/units/systemd-nspawn@.service.in @@ -10,7 +10,7 @@ Description=Container %i Documentation=man:systemd-nspawn(1) PartOf=machines.target Before=machines.target -After=network.target +After=network.target systemd-resolved.service [Service] ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in index 0f0440ddaf..d3b8f81601 100644 --- a/units/systemd-resolved.service.m4.in +++ b/units/systemd-resolved.service.m4.in @@ -38,3 +38,4 @@ SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module @mount @obsolete [Install] WantedBy=multi-user.target +Alias=dbus-org.freedesktop.resolve1.service |