diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-05-31 11:31:27 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-05-31 14:56:45 +0200 |
| commit | 32927f5d66fa996ecd5505fd222bfd525ba69f61 (patch) | |
| tree | 9f5765139fd9490501e7d70a1940aa27a9c58b63 /pkg/systemd/generate/common.go | |
| parent | ba1dac74055f1a79e3ebea73913067a9560e96c1 (diff) | |
| download | podman-32927f5d66fa996ecd5505fd222bfd525ba69f61.tar.gz podman-32927f5d66fa996ecd5505fd222bfd525ba69f61.tar.bz2 podman-32927f5d66fa996ecd5505fd222bfd525ba69f61.zip | |
generate systemd: make mounts portable
Commit 748826fc88fc fixed a bug where slow mounting of the runroot was
causing issues when the units are started at boot. The fix was to add
the container's runroot to the required mounts; the graph root has been
added as well.
Hard-coding the run- and graphroot to the required mounts, however,
breaks the portability of units generated with --now. Those units are
intended to be running on any machine as, theoreticaly, any user.
Make the mounts portable by using the `%t` macro for the run root.
Since the graphroot's location varies across root and ordinary users,
drop it from the list of required mounts. The graphroot was not causing
issues.
Fixes: #10493
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/systemd/generate/common.go')
| -rw-r--r-- | pkg/systemd/generate/common.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/systemd/generate/common.go b/pkg/systemd/generate/common.go index 0f667e2f4..1ee070888 100644 --- a/pkg/systemd/generate/common.go +++ b/pkg/systemd/generate/common.go @@ -36,7 +36,7 @@ Description=Podman {{{{.ServiceName}}}}.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -RequiresMountsFor={{{{.GraphRoot}}}} {{{{.RunRoot}}}} +RequiresMountsFor={{{{.RunRoot}}}} ` // filterPodFlags removes --pod, --pod-id-file and --infra-conmon-pidfile from the specified command. |