summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Wang <li.wang@windriver.com>2015-06-29 14:22:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-01 15:40:00 +0100
commit63873d02c0b530d4f55e1bea9e0150c426ccb59e (patch)
tree57faa7d7350678f05721a490fa298f7e1869ae38
parent703108c98639746929eeb6c34e9e57a907dde110 (diff)
downloadpoky-63873d02c0b530d4f55e1bea9e0150c426ccb59e.tar.gz
nfs-utils: debianize start-statd
make start-statd command to use nfscommon configure, too. (From OE-Core rev: 98d3607697da77bd79b367b2879ef6944e59d0a3) Signed-off-by: Henrik Riomar <henrik.riomar@ericsson.com> Signed-off-by: Li Wang <li.wang@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch41
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb1
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch b/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
new file mode 100644
index 0000000000..5a2d5c8544
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
@@ -0,0 +1,41 @@
1[PATCH] nfs-utils: debianize start-statd
2
3Upstream-status: Pending
4
5make start-statd command to use nfscommon configure, too.
6
7Signed-off-by: Henrik Riomar <henrik.riomar@ericsson.com>
8Signed-off-by: Li Wang <li.wang@windriver.com>
9Signed-off-by: Roy Li <rongqing.li@windriver.com>
10Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
11---
12 utils/statd/start-statd | 9 ++++++++-
13 1 file changed, 8 insertions(+), 1 deletion(-)
14
15diff --git a/utils/statd/start-statd b/utils/statd/start-statd
16index ec9383b..3969b8c 100755
17--- a/utils/statd/start-statd
18+++ b/utils/statd/start-statd
19@@ -6,6 +6,13 @@
20 # site.
21 PATH="/sbin:/usr/sbin:/bin:/usr/bin"
22
23+# Read config
24+DEFAULTFILE=/etc/default/nfs-common
25+NEED_IDMAPD=
26+if [ -f $DEFAULTFILE ]; then
27+ . $DEFAULTFILE
28+fi
29+
30 # First try systemd if it's installed.
31 if systemctl --help >/dev/null 2>&1; then
32 # Quit only if the call worked.
33@@ -13,4 +20,4 @@ if systemctl --help >/dev/null 2>&1; then
34 fi
35
36 # Fall back to launching it ourselves.
37-exec rpc.statd --no-notify
38+exec rpc.statd --no-notify $STATDOPTS
39--
401.9.1
41
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
index 6f64e9d001..0bcd65e0d0 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
@@ -29,6 +29,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
29 file://nfs-mountd.service \ 29 file://nfs-mountd.service \
30 file://nfs-statd.service \ 30 file://nfs-statd.service \
31 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ 31 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
32 file://nfs-utils-debianize-start-statd.patch \
32" 33"
33 34
34SRC_URI[md5sum] = "8de676b9ff34b8f9addc1d0800fabdf8" 35SRC_URI[md5sum] = "8de676b9ff34b8f9addc1d0800fabdf8"