dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-07 08:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16430 from mikhailnov/fix-rpm-create-package-macros

Browse Source 
Fix RPM *_create_package macros
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-07-14 19:02:09 +02:00
committed by GitHub
parent 16a4a2f8cc 3e6e0856cd
commit 8800df5f71
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/macros.systemd.in
View File

@@ -104,7 +104,7 @@ fi \
%sysusers_create_inline() \
[ -x @bindir@/systemd-sysusers ] && @bindir@/systemd-sysusers - <<SYSTEMD_INLINE_EOF || : \
%{?*} \
SYSTEMD_INLINE_EOF \
SYSTEMD_INLINE_EOF\
%{nil}
# This should be used by package installation scripts which require users or
@@ -122,9 +122,9 @@ 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 \
SYSTEMD_INLINE_EOF\
%{nil}
# This may be used by package installation scripts to create files according to
@@ -142,9 +142,9 @@ 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 \
SYSTEMD_INLINE_EOF\
%{nil}
%sysctl_apply() \