Accepting request 141246 from GNOME:Next

useradd -o without -u is bogus

OBS-URL: https://build.opensuse.org/request/show/141246
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=92
This commit is contained in:
Dominique Leuenberger 2012-11-14 09:18:10 +00:00 committed by Git OBS Bridge
parent de82197151
commit 53a2359ea9
5 changed files with 10 additions and 4 deletions

View File

@ -910,7 +910,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210 %if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service %service_add_pre avahi-dnsconfd.service avahi-daemon.service
%endif %endif

View File

@ -909,7 +909,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210 %if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service %service_add_pre avahi-dnsconfd.service avahi-daemon.service
%endif %endif

View File

@ -912,7 +912,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210 %if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service %service_add_pre avahi-dnsconfd.service avahi-daemon.service
%endif %endif

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 14 09:05:25 UTC 2012 - dimstar@opensuse.org
- Fix useradd invocation: -o is useless without -u and newer
versions of pwdutils/shadowutils fail on this now.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 16 11:37:56 UTC 2012 - coolo@suse.com Tue Oct 16 11:37:56 UTC 2012 - coolo@suse.com

View File

@ -912,7 +912,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210 %if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service %service_add_pre avahi-dnsconfd.service avahi-daemon.service
%endif %endif