diff options
author | Li Wang <li.wang@windriver.com> | 2015-06-29 14:22:35 +0800 |
---|---|---|
committer | Andreas Oberritter <obi@opendreambox.org> | 2015-10-12 15:17:21 +0200 |
commit | 2b6e62175e447e735f9eae073c9653104e0c0125 (patch) | |
tree | e28b61eae431fb858d0e4bf8854465d08b2709e4 | |
parent | 8bd279e29d5b7586b8e9630728f5a3d4e004757f (diff) | |
download | openembedded-core-contrib-2b6e62175e447e735f9eae073c9653104e0c0125.tar.gz |
nfs-utils: debianize start-statd
make start-statd command to use nfscommon configure, too.
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>
(cherry picked from commit 98d3607697da77bd79b367b2879ef6944e59d0a3)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch | 41 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb | 1 |
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 @@ +[PATCH] nfs-utils: debianize start-statd + +Upstream-status: Pending + +make start-statd command to use nfscommon configure, too. + +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> +--- + utils/statd/start-statd | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/utils/statd/start-statd b/utils/statd/start-statd +index ec9383b..3969b8c 100755 +--- a/utils/statd/start-statd ++++ b/utils/statd/start-statd +@@ -6,6 +6,13 @@ + # site. + PATH="/sbin:/usr/sbin:/bin:/usr/bin" + ++# Read config ++DEFAULTFILE=/etc/default/nfs-common ++NEED_IDMAPD= ++if [ -f $DEFAULTFILE ]; then ++ . $DEFAULTFILE ++fi ++ + # First try systemd if it's installed. + if systemctl --help >/dev/null 2>&1; then + # Quit only if the call worked. +@@ -13,4 +20,4 @@ if systemctl --help >/dev/null 2>&1; then + fi + + # Fall back to launching it ourselves. +-exec rpc.statd --no-notify ++exec rpc.statd --no-notify $STATDOPTS +-- +1.9.1 + 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 4799429292..f6f05531d7 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 @@ -30,6 +30,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfs-mountd.service \ file://nfs-statd.service \ file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ + file://nfs-utils-debianize-start-statd.patch \ " SRC_URI[md5sum] = "8de676b9ff34b8f9addc1d0800fabdf8" |