summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-08-28 19:04:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-30 17:10:28 +0100
commit19985178e7bd01234d93b6b97071f193ed29b2b3 (patch)
treebdbb5dbaa0b2765fd90aaf07d70a8dca6c949b7d /meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch
parentd6094e1e4e49be02932a757373e8b01e97ff3709 (diff)
downloadpoky-19985178e7bd01234d93b6b97071f193ed29b2b3.tar.gz
nfs-utils: 2.3.3 -> 2.4.1
- Remove 0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch, the new api can check the pointer before free it. - Rmove 0001-makefile.am-update-the-path-of-libnfs.a.patch, it is already in the source. - Rmove nfs-utils-musl-limits.patch, it is already fixed. - Rebased the following patches: 0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch 0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch bugfix-adjust-statd-service-name.patch nfs-utils-musl-res_querydomain.patch (From OE-Core rev: 5601523e16ebd35d7de8d22ec5590618ea9f7ffb) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch')
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch30
1 files changed, 19 insertions, 11 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch
index 822939f0d2..f13d7b380c 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch
@@ -12,20 +12,28 @@ instead but forgot to update the mount.nfs helper 'start-statd' accordingly.
12Upstream-Status: Inappropriate [other] 12Upstream-Status: Inappropriate [other]
13 13
14Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> 14Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
15
16Rebase it.
17
18Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15--- 19---
16 utils/statd/start-statd | 2 +- 20 utils/statd/start-statd | 4 ++--
17 1 file changed, 1 insertion(+), 1 deletion(-) 21 1 file changed, 2 insertions(+), 2 deletions(-)
18 22
19Index: nfs-utils-2.1.1/utils/statd/start-statd 23diff --git a/utils/statd/start-statd b/utils/statd/start-statd
20=================================================================== 24index af5c950..df9b9be 100755
21--- nfs-utils-2.1.1.orig/utils/statd/start-statd 25--- a/utils/statd/start-statd
22+++ nfs-utils-2.1.1/utils/statd/start-statd 26+++ b/utils/statd/start-statd
23@@ -28,7 +28,7 @@ fi 27@@ -28,10 +28,10 @@ fi
24 # First try systemd if it's installed. 28 # First try systemd if it's installed.
25 if [ -d /run/systemd/system ]; then 29 if [ -d /run/systemd/system ]; then
26 # Quit only if the call worked. 30 # Quit only if the call worked.
27- systemctl start rpc-statd.service && exit 31- if systemctl start rpc-statd.service; then
28+ systemctl start nfs-statd.service && exit 32+ if systemctl start nfs-statd.service; then
33 # Ensure systemd knows not to stop rpc.statd or its dependencies
34 # on 'systemctl isolate ..'
35- systemctl add-wants --runtime remote-fs.target rpc-statd.service
36+ systemctl add-wants --runtime remote-fs.target nfs-statd.service
37 exit 0
38 fi
29 fi 39 fi
30
31 cd /