From 72212c0dc35ed0594e42ef00b3444c7d29341ddc Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 23 Dec 2016 20:24:32 +0000 Subject: [PATCH 1/2] rpcbind: needs to wait until /var/run is available --- .../patches/rpcbind-01-drop-warm-start-as-it-fails.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch b/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch index 6776ca75f5..b85d4af2ec 100644 --- a/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch +++ b/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch @@ -6,7 +6,7 @@ diff -Naur a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in # rpcbind.socket, no matter how this unit is started. Wants=rpcbind.socket -After=rpcbind.socket -+After=rpcbind.socket var.mount ++After=rpcbind.socket systemd-tmpfiles-setup.service [Service] Type=notify From fc0bda61cfeaf52fb8d7bce5e13bf3c207b0109b Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 23 Dec 2016 20:52:00 +0000 Subject: [PATCH 2/2] rpcbind: remove redundant systemd unit files --- packages/network/rpcbind/system.d/rpcbind.service | 14 -------------- packages/network/rpcbind/system.d/rpcbind.socket | 9 --------- 2 files changed, 23 deletions(-) delete mode 100644 packages/network/rpcbind/system.d/rpcbind.service delete mode 100644 packages/network/rpcbind/system.d/rpcbind.socket diff --git a/packages/network/rpcbind/system.d/rpcbind.service b/packages/network/rpcbind/system.d/rpcbind.service deleted file mode 100644 index 13c0aa264c..0000000000 --- a/packages/network/rpcbind/system.d/rpcbind.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=RPC bind service -Requires=rpcbind.socket -After=syslog.target network.target - -[Service] -Type=forking -ExecStart=/usr/bin/rpcbind -TimeoutStopSec=1s - -[Install] -WantedBy=multi-user.target -Also=rpcbind.socket - diff --git a/packages/network/rpcbind/system.d/rpcbind.socket b/packages/network/rpcbind/system.d/rpcbind.socket deleted file mode 100644 index 714370dc79..0000000000 --- a/packages/network/rpcbind/system.d/rpcbind.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=RPCbind Server Activation Socket - -[Socket] -ListenStream=/var/run/rpcbind.sock - -[Install] -WantedBy=sockets.target -