diff options
author | Roy.Li <rongqing.li@windriver.com> | 2014-10-20 13:38:14 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-24 17:36:16 +0100 |
commit | 0de79a72bf6173b950fc0619b87a8cbe35067f26 (patch) | |
tree | bd244bd938ad99d0c81845342ef254326ac25c4f /meta/recipes-connectivity/nfs-utils | |
parent | 38f02f18361389beef2768aac0fec5d95e290e6a (diff) | |
download | poky-0de79a72bf6173b950fc0619b87a8cbe35067f26.tar.gz |
nfs-utils: fix start-statd
1. add /bin to PATH of start-statd, otherwise systemctl can not be found.
2. drop error when systemd fails to start statd.service; since if it failed,
rpc.statd will be called directly.
(From OE-Core rev: 048130996300e1762bc6d714ba09aac5a326843d)
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch | 30 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch new file mode 100644 index 0000000000..b7e835ed35 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | [PATCH] fix the start-statd | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | 1. add /bin/ to PATH, since systemctl is installed under /bin/ | ||
6 | 2. redirect error to /dev/null | ||
7 | |||
8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
9 | --- | ||
10 | utils/statd/start-statd | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/utils/statd/start-statd b/utils/statd/start-statd | ||
14 | index cde3583..098ce70 100644 | ||
15 | --- a/utils/statd/start-statd | ||
16 | +++ b/utils/statd/start-statd | ||
17 | @@ -4,8 +4,8 @@ | ||
18 | # /var/run/rpc.statd.pid). | ||
19 | # It should run statd with whatever flags are apropriate for this | ||
20 | # site. | ||
21 | -PATH=/sbin:/usr/sbin | ||
22 | -if systemctl start statd.service | ||
23 | +PATH=/sbin:/usr/sbin:/bin | ||
24 | +if systemctl start statd.service 2>/dev/null | ||
25 | then : | ||
26 | else | ||
27 | exec rpc.statd --no-notify | ||
28 | -- | ||
29 | 1.7.10.4 | ||
30 | |||
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb index f1ef6d9a0c..4933e10403 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb | |||
@@ -32,6 +32,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x | |||
32 | file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ | 32 | file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ |
33 | file://0001-statd-fixed-the-with-statdpath-flag.patch \ | 33 | file://0001-statd-fixed-the-with-statdpath-flag.patch \ |
34 | file://fix-a-Gcc-undefined-behavior.patch \ | 34 | file://fix-a-Gcc-undefined-behavior.patch \ |
35 | file://fix-the-start-statd.patch \ | ||
35 | " | 36 | " |
36 | 37 | ||
37 | SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8" | 38 | SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8" |