Accepting request 228296 from home:WernerFink:branches:network

- Add 0027-socket-before-service.patch to make sure that always
  the socket is up before the service.  This will make sure that
  rpcbind.target will not only cause the socket but also the
  rpcbind.service (bnc#860246)
- Beside this ingnore exit state 2 in case of shutdown (bnc#860246)

OBS-URL: https://build.opensuse.org/request/show/228296
OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=42
This commit is contained in:
Sascha Peilicke 2014-04-01 08:31:09 +00:00 committed by Git OBS Bridge
parent d2b059e75b
commit 467a98bad0
3 changed files with 48 additions and 0 deletions

View File

@ -0,0 +1,37 @@
Ignore exit state of two and also be sure that rpcbind.service will
trigger rpcbind.socket before its own start which the fulfill rpcbind.target
References: bnc#870158, bnc#860246
Signed-off-by: Werner Fink <werner@suse.de>
---
systemd/rpcbind.service.in | 3 +++
systemd/rpcbind.socket | 1 +
2 files changed, 4 insertions(+)
--- rpcbind-0.2.1_rc4/systemd/rpcbind.service.in
+++ rpcbind-0.2.1_rc4/systemd/rpcbind.service.in 2014-03-31 10:29:29.262735423 +0000
@@ -1,11 +1,14 @@
[Unit]
Description=RPC Bind
+Documentation=man:rpcbind(8)
DefaultDependencies=no
+Requires=rpcbind.socket
[Service]
Type=notify
EnvironmentFile=-/etc/sysconfig/rpcbind
ExecStart=@bindir@/rpcbind $RPCBIND_OPTIONS -w -f
+SuccessExitStatus=2
[Install]
WantedBy=multi-user.target
--- rpcbind-0.2.1_rc4/systemd/rpcbind.socket
+++ rpcbind-0.2.1_rc4/systemd/rpcbind.socket 2014-03-31 10:30:12.799480612 +0000
@@ -1,5 +1,6 @@
[Unit]
Description=RPCbind Server Activation Socket
+Documentation=man:rpcbind(8)
DefaultDependencies=no
Wants=rpcbind.target
Before=rpcbind.target

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Mar 31 10:38:40 UTC 2014 - werner@suse.de
- Add 0027-socket-before-service.patch to make sure that always
the socket is up before the service. This will make sure that
rpcbind.target will not only cause the socket but also the
rpcbind.service (bnc#860246)
- Beside this ingnore exit state 2 in case of shutdown (bnc#860246)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 26 21:52:19 UTC 2014 - nfbrown@suse.com Wed Mar 26 21:52:19 UTC 2014 - nfbrown@suse.com

View File

@ -62,6 +62,7 @@ Patch22: 0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch
Patch23: 0024-rpcinfo-remove-obsolete-function-get_inet_address.patch Patch23: 0024-rpcinfo-remove-obsolete-function-get_inet_address.patch
Patch24: 0025-rpcinfo-warmstat_no-warning-about-missing-file.patch Patch24: 0025-rpcinfo-warmstat_no-warning-about-missing-file.patch
Patch25: 0026-systemd-no-default-dep Patch25: 0026-systemd-no-default-dep
Patch26: 0027-socket-before-service.patch
%define statefile /var/lib/portmap.state %define statefile /var/lib/portmap.state
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
@ -104,6 +105,7 @@ cp %{SOURCE4} .
%patch23 -p1 %patch23 -p1
%patch24 -p0 %patch24 -p0
%patch25 -p1 %patch25 -p1
%patch26 -p1
%build %build
autoreconf -fiv autoreconf -fiv