summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy.Li <rongqing.li@windriver.com>2014-10-20 13:38:14 +0800
committerAndreas Oberritter <obi@opendreambox.org>2015-10-12 15:12:11 +0200
commitf1c93a1e6996ccb8bc643433e74947a152fda068 (patch)
tree1bed49a687ff1d65a13fd7f620c681fb45064888
parent4c8c9a5d1c6c6711f953b5cab01861e1343e0cbd (diff)
downloadopenembedded-core-contrib-f1c93a1e6996ccb8bc643433e74947a152fda068.tar.gz
openembedded-core-contrib-f1c93a1e6996ccb8bc643433e74947a152fda068.tar.bz2
openembedded-core-contrib-f1c93a1e6996ccb8bc643433e74947a152fda068.zip
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. Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 048130996300e1762bc6d714ba09aac5a326843d) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch30
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb1
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 @@
+[PATCH] fix the start-statd
+
+Upstream-Status: Pending
+
+1. add /bin/ to PATH, since systemctl is installed under /bin/
+2. redirect error to /dev/null
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ utils/statd/start-statd | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/utils/statd/start-statd b/utils/statd/start-statd
+index cde3583..098ce70 100644
+--- a/utils/statd/start-statd
++++ b/utils/statd/start-statd
+@@ -4,8 +4,8 @@
+ # /var/run/rpc.statd.pid).
+ # It should run statd with whatever flags are apropriate for this
+ # site.
+-PATH=/sbin:/usr/sbin
+-if systemctl start statd.service
++PATH=/sbin:/usr/sbin:/bin
++if systemctl start statd.service 2>/dev/null
+ then :
+ else
+ exec rpc.statd --no-notify
+--
+1.7.10.4
+
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 e41d5a87a4..0fdfe3fa2a 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
@@ -33,6 +33,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
file://0001-statd-fixed-the-with-statdpath-flag.patch \
file://fix-a-Gcc-undefined-behavior.patch \
+ file://fix-the-start-statd.patch \
"
SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"