Revert "Optimize systemd dependency for containers"

It was generally a mistake to use `%systemd_ordering` in those
circumstances, as the tmpfiles stuff doesn't work and populate the
`/tmp` and `/run` directories. The reason why the packages install is
that all the commands in the macros have `|| :` at the end, so their
error state is ignored.

Something to re-consider for future attempts to fix/improve that:
If the tmpfiles and such were split out into a subpackage that'd be
required if and only if the kernel was installed or being installed,
that might work.

Related: rhbz#1654672
Related-Bug: #1804822
This reverts commit e07ed63d65.
epel9
Bogdan Dobrelya 6 years ago
parent a99941884f
commit 4ff2bb73dd

@ -103,7 +103,7 @@ Provides: hiera-puppet = %{version}-%{release}
Requires(pre): shadow-utils Requires(pre): shadow-utils
%if 0%{?_with_systemd} %if 0%{?_with_systemd}
%{?systemd_ordering} %{?systemd_requires}
BuildRequires: systemd BuildRequires: systemd
%else %else
Requires(post): chkconfig Requires(post): chkconfig
@ -124,7 +124,7 @@ along with obviously discrete elements like packages, services, and files.
Summary: Server for the puppet system management tool Summary: Server for the puppet system management tool
Requires: puppet = %{version}-%{release} Requires: puppet = %{version}-%{release}
%if 0%{?_with_systemd} %if 0%{?_with_systemd}
%{?systemd_ordering} %{?systemd_requires}
BuildRequires: systemd BuildRequires: systemd
%else %else
Requires(post): chkconfig Requires(post): chkconfig

Loading…
Cancel
Save