diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-10-07 08:10:41 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-10-12 07:57:26 -0600 |
| commit | 69b66599609c6513de8d72c45fe327312b0b81ac (patch) | |
| tree | 0b853ab073495cd8f779da80250cc716b90c54f4 /contrib/spec | |
| parent | 2fcec59445267e8c8e06005539701a172d3db8a5 (diff) | |
| download | podman-69b66599609c6513de8d72c45fe327312b0b81ac.tar.gz podman-69b66599609c6513de8d72c45fe327312b0b81ac.tar.bz2 podman-69b66599609c6513de8d72c45fe327312b0b81ac.zip | |
Unit files: Use actual installed path for podman
Don't hardcode /usr/bin/podman in unit files: instead, use
template files with a path replaced at install time.
Because 'make' can be invoked repeatedly, with different
PREFIX, do not leave the generated files behind in our
work directory: wipe them immediately after install.
To get this to work, fix a longstanding bug in podman.spec.in,
a PREFIX that should've been DESTDIR.
Side note: #7023 made contrib/systemd/user a symlink
to .../system but did not update paths in Makefile.
The unrelated-looking path change you see here is
a belated correction for that.
Fixes: #10787
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'contrib/spec')
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index fa513932f..3a4026038 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -435,7 +435,7 @@ BUILDTAGS=$BUILDTAGS make binaries %install install -dp %{buildroot}%{_unitdir} install -dp %{buildroot}%{_usr}/lib/systemd/user -PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ +PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDIR=%{_sysconfdir} \ install.bin-nobuild \ install.remote-nobuild \ %if %{with doc} |