diff options
| author | Mikhail Novosyolov <m.novosyolov@rosalinux.ru> | 2020-07-11 17:13:54 +0300 |
|---|---|---|
| committer | Mikhail Novosyolov <m.novosyolov@rosalinux.ru> | 2020-07-11 17:20:23 +0300 |
| commit | 3e6e0856cd98dd091137c4565bd5ccefd16ab832 (patch) | |
| tree | 2a03dfdd819a0ea37511fd1433ee697530e10b5b | |
| parent | 93406fd379d3ba184eec2eb664729edef1bca995 (diff) | |
| download | systemd-3e6e0856cd98dd091137c4565bd5ccefd16ab832.tar.gz | |
rpm: avoid hiding errors and output in *_create_package macros
Commit b0ca726585 "rpm: avoid hiding errors from systemd commands" remove hiding errors and output
for other macros, but did not do that for %sysusers_create_package and %tmpfiles_create_package.
This change syncs their behaviour with %sysusers_create and %tmpfiles_create
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
| -rw-r--r-- | src/core/macros.systemd.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in index e5c41f68e4..80827b6ea4 100644 --- a/src/core/macros.systemd.in +++ b/src/core/macros.systemd.in @@ -122,7 +122,7 @@ SYSTEMD_INLINE_EOF\ # %{_sysusersdir}/%{name}.conf %sysusers_create_package() \ %{expand:%%{?!__systemd_twoargs_%#:%%{error:This macro requires two arguments}}} \ -systemd-sysusers --replace=%_sysusersdir/%1.conf - <<SYSTEMD_INLINE_EOF >/dev/null 2>&1 || : \ +systemd-sysusers --replace=%_sysusersdir/%1.conf - <<SYSTEMD_INLINE_EOF || : \ %(cat %2) \ SYSTEMD_INLINE_EOF\ %{nil} @@ -142,7 +142,7 @@ SYSTEMD_INLINE_EOF\ # %{_tmpfilesdir}/%{name}.conf %tmpfiles_create_package() \ %{expand:%%{?!__systemd_twoargs_%#:%%{error:This macro requires two arguments}}} \ -systemd-tmpfiles --replace=%_tmpfilesdir/%1.conf --create - <<SYSTEMD_INLINE_EOF >/dev/null 2>&1 || : \ +systemd-tmpfiles --replace=%_tmpfilesdir/%1.conf --create - <<SYSTEMD_INLINE_EOF || : \ %(cat %2) \ SYSTEMD_INLINE_EOF\ %{nil} |