Accepting request 499768 from GNOME:Next
Modify user generation scripts OBS-URL: https://build.opensuse.org/request/show/499768 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=136
This commit is contained in:
parent
dd016efad2
commit
5a55749fa9
@ -724,7 +724,6 @@ correct mDNS reflection across LAN segments.
|
||||
|
||||
%package -n avahi-mono
|
||||
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
|
||||
License: LGPL-2.1+
|
||||
Group: Development/Languages/Mono
|
||||
Requires: gtk-sharp2
|
||||
Requires: libavahi-client3 >= %{version}
|
||||
@ -968,8 +967,8 @@ strip-nondeterminism $RPM_BUILD_ROOT%{_prefix}/lib/monodoc/sources/*.zip
|
||||
%if %build_core
|
||||
|
||||
%pre
|
||||
%{_sbindir}/groupadd -r avahi 2> /dev/null || :
|
||||
%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || :
|
||||
getent group avahi || %{_sbindir}/groupadd -r avahi
|
||||
getent passwd avahi || %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi
|
||||
%service_add_pre avahi-dnsconfd.service avahi-daemon.service
|
||||
# bnc#853845,bnc#851953: do not start by default under
|
||||
# sysconfig as this breaks vlan,bridge,bonding setups
|
||||
|
@ -967,8 +967,8 @@ strip-nondeterminism $RPM_BUILD_ROOT%{_prefix}/lib/monodoc/sources/*.zip
|
||||
%if %build_core
|
||||
|
||||
%pre
|
||||
%{_sbindir}/groupadd -r avahi 2> /dev/null || :
|
||||
%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || :
|
||||
getent group avahi || %{_sbindir}/groupadd -r avahi
|
||||
getent passwd avahi || %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi
|
||||
%service_add_pre avahi-dnsconfd.service avahi-daemon.service
|
||||
# bnc#853845,bnc#851953: do not start by default under
|
||||
# sysconfig as this breaks vlan,bridge,bonding setups
|
||||
|
@ -726,7 +726,6 @@ correct mDNS reflection across LAN segments.
|
||||
|
||||
%package -n avahi-mono
|
||||
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
|
||||
License: LGPL-2.1+
|
||||
Group: Development/Languages/Mono
|
||||
Requires: gtk-sharp2
|
||||
Requires: libavahi-client3 >= %{version}
|
||||
@ -970,8 +969,8 @@ strip-nondeterminism $RPM_BUILD_ROOT%{_prefix}/lib/monodoc/sources/*.zip
|
||||
%if %build_core
|
||||
|
||||
%pre
|
||||
%{_sbindir}/groupadd -r avahi 2> /dev/null || :
|
||||
%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || :
|
||||
getent group avahi || %{_sbindir}/groupadd -r avahi
|
||||
getent passwd avahi || %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi
|
||||
%service_add_pre avahi-dnsconfd.service avahi-daemon.service
|
||||
# bnc#853845,bnc#851953: do not start by default under
|
||||
# sysconfig as this breaks vlan,bridge,bonding setups
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 30 13:22:45 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Modify user generation (boo#1010384):
|
||||
+ Use getent to check for existing users/groups, only creating
|
||||
them if not found.
|
||||
+ Do not hide output of groupadd/useradd.
|
||||
+ Do not mask failures: if a user can't be added, we have a
|
||||
problem.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 15 17:58:46 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
|
@ -726,7 +726,6 @@ correct mDNS reflection across LAN segments.
|
||||
|
||||
%package -n avahi-mono
|
||||
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
|
||||
License: LGPL-2.1+
|
||||
Group: Development/Languages/Mono
|
||||
Requires: gtk-sharp2
|
||||
Requires: libavahi-client3 >= %{version}
|
||||
@ -970,8 +969,8 @@ strip-nondeterminism $RPM_BUILD_ROOT%{_prefix}/lib/monodoc/sources/*.zip
|
||||
%if %build_core
|
||||
|
||||
%pre
|
||||
%{_sbindir}/groupadd -r avahi 2> /dev/null || :
|
||||
%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || :
|
||||
getent group avahi || %{_sbindir}/groupadd -r avahi
|
||||
getent passwd avahi || %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi
|
||||
%service_add_pre avahi-dnsconfd.service avahi-daemon.service
|
||||
# bnc#853845,bnc#851953: do not start by default under
|
||||
# sysconfig as this breaks vlan,bridge,bonding setups
|
||||
|
Loading…
Reference in New Issue
Block a user