From eb205050c26591168a7189223c8fa711aaf4c8af517e72d76e0b8ff547fcce62 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Sat, 21 Mar 2020 13:51:38 +0000 Subject: [PATCH 1/2] Accepting request 787138 from home:kukuk:container - Call usermod only if installed OBS-URL: https://build.opensuse.org/request/show/787138 OBS-URL: https://build.opensuse.org/package/show/Base:System/system-users?expand=0&rev=44 --- system-users.changes | 5 +++++ system-users.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/system-users.changes b/system-users.changes index 46385bd..2058697 100644 --- a/system-users.changes +++ b/system-users.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 20 19:00:10 UTC 2020 - Thorsten Kukuk + +- Call usermod only if installed + ------------------------------------------------------------------- Tue Feb 18 12:52:51 UTC 2020 - Michal Suchanek diff --git a/system-users.spec b/system-users.spec index 1bf1646..c9a6d55 100644 --- a/system-users.spec +++ b/system-users.spec @@ -166,7 +166,6 @@ This package provides the system account and group 'lp'. %package -n system-user-nobody Summary: System user and group nobody Group: System/Fhs -Requires(pre): /usr/sbin/usermod %{sysusers_requires} %description -n system-user-nobody @@ -276,7 +275,7 @@ install -m 644 %{SOURCE20} %{buildroot}%{_sysusersdir}/system-user-tss.conf %pre -n system-user-lp -f lp.pre %pre -n system-user-nobody -f nobody.pre %post -n system-user-nobody -/usr/sbin/usermod -s /bin/bash nobody +test -f /usr/sbin/usermod && /usr/sbin/usermod -s /bin/bash nobody ||: %pre -n system-user-upsd -f upsd.pre %pre -n system-user-uuidd -f uuidd.pre From d80072ee8a62010ae70d24bb2e93e4cc6beff31b82d019b09df139f73733d859 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Wed, 25 Mar 2020 10:11:34 +0000 Subject: [PATCH 2/2] Accepting request 788124 from home:kukuk:container - Use test -x instead of -f OBS-URL: https://build.opensuse.org/request/show/788124 OBS-URL: https://build.opensuse.org/package/show/Base:System/system-users?expand=0&rev=45 --- system-users.changes | 5 +++++ system-users.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/system-users.changes b/system-users.changes index 2058697..366c335 100644 --- a/system-users.changes +++ b/system-users.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 25 10:10:46 UTC 2020 - Thorsten Kukuk + +- Use test -x instead of -f + ------------------------------------------------------------------- Fri Mar 20 19:00:10 UTC 2020 - Thorsten Kukuk diff --git a/system-users.spec b/system-users.spec index c9a6d55..69866ee 100644 --- a/system-users.spec +++ b/system-users.spec @@ -275,7 +275,7 @@ install -m 644 %{SOURCE20} %{buildroot}%{_sysusersdir}/system-user-tss.conf %pre -n system-user-lp -f lp.pre %pre -n system-user-nobody -f nobody.pre %post -n system-user-nobody -test -f /usr/sbin/usermod && /usr/sbin/usermod -s /bin/bash nobody ||: +test -x /usr/sbin/usermod && /usr/sbin/usermod -s /bin/bash nobody ||: %pre -n system-user-upsd -f upsd.pre %pre -n system-user-uuidd -f uuidd.pre