From a3b5252d1f768e64420422f13c63f16f8770574fb0b462ef5a556510a60a00cd Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Tue, 20 Nov 2012 08:36:23 +0000 Subject: [PATCH] Accepting request 142001 from home:dimstar:branches:network:utilities - Fix useradd invocation: -o is useless without -u and newer versions of pwdutils/shadowutils fail on this now. Error is masked due to || : OBS-URL: https://build.opensuse.org/request/show/142001 OBS-URL: https://build.opensuse.org/package/show/network:utilities/memcached?expand=0&rev=16 --- memcached.changes | 6 ++++++ memcached.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/memcached.changes b/memcached.changes index b707f61..1cf6fae 100644 --- a/memcached.changes +++ b/memcached.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 20 07:51:02 UTC 2012 - dimstar@opensuse.org + +- Fix useradd invocation: -o is useless without -u and newer + versions of pwdutils/shadowutils fail on this now. + ------------------------------------------------------------------- Wed Nov 7 20:47:22 UTC 2012 - chris@computersalat.de diff --git a/memcached.spec b/memcached.spec index 4f0d8ef..ba49711 100644 --- a/memcached.spec +++ b/memcached.spec @@ -107,7 +107,7 @@ make %{?_smp_mflags} %pre /usr/sbin/groupadd -r %{pkg_name} &>/dev/null || : -/usr/sbin/useradd -o -g %{pkg_name} -s /bin/false -r -c "user for %{pkg_name}" -d %{home_dir} %{pkg_name} &>/dev/null || : +/usr/sbin/useradd -g %{pkg_name} -s /bin/false -r -c "user for %{pkg_name}" -d %{home_dir} %{pkg_name} &>/dev/null || : %if %{with systemd} %service_add_pre %{pkg_name}.service %endif