diff options
author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2016-11-23 14:41:03 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:07 +0000 |
commit | 93947f60e94aba68057d3cc00511f1322cc801b5 (patch) | |
tree | 988a818b59743f95e4a35c8f0044155fe222a92f /meta/recipes-connectivity/nfs-utils/files | |
parent | 8be26d5833cea0d221d85a3502bbc11641209701 (diff) | |
download | poky-93947f60e94aba68057d3cc00511f1322cc801b5.tar.gz |
nfs-utils: 1.3.3 -> 1.3.4
(From OE-Core rev: 844c63050e849c68fc9b40ada2068309e5e37e16)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.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/files')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch | 23 |
1 files changed, 12 insertions, 11 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 index 85002290f0..ede0dcefc4 100644 --- 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 | |||
@@ -9,17 +9,18 @@ Signed-off-by: Li Wang <li.wang@windriver.com> | |||
9 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 9 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
10 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 10 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
11 | --- | 11 | --- |
12 | utils/statd/start-statd | 9 ++++++++- | 12 | utils/statd/start-statd | 10 +++++++++- |
13 | 1 file changed, 8 insertions(+), 1 deletion(-) | 13 | 1 file changed, 9 insertions(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/utils/statd/start-statd b/utils/statd/start-statd | 15 | diff --git a/utils/statd/start-statd b/utils/statd/start-statd |
16 | index ec9383b..3969b8c 100755 | 16 | index 2fd6039..f591b34 100755 |
17 | --- a/utils/statd/start-statd | 17 | --- a/utils/statd/start-statd |
18 | +++ b/utils/statd/start-statd | 18 | +++ b/utils/statd/start-statd |
19 | @@ -6,6 +6,13 @@ | 19 | @@ -17,6 +17,14 @@ then |
20 | # site. | 20 | # statd already running - must have been slow to respond. |
21 | PATH="/sbin:/usr/sbin:/bin:/usr/bin" | 21 | exit 0 |
22 | 22 | fi | |
23 | + | ||
23 | +# Read config | 24 | +# Read config |
24 | +DEFAULTFILE=/etc/default/nfs-common | 25 | +DEFAULTFILE=/etc/default/nfs-common |
25 | +NEED_IDMAPD= | 26 | +NEED_IDMAPD= |
@@ -28,14 +29,14 @@ index ec9383b..3969b8c 100755 | |||
28 | +fi | 29 | +fi |
29 | + | 30 | + |
30 | # First try systemd if it's installed. | 31 | # First try systemd if it's installed. |
31 | if systemctl --help >/dev/null 2>&1; then | 32 | if [ -d /run/systemd/system ]; then |
32 | # Quit only if the call worked. | 33 | # Quit only if the call worked. |
33 | @@ -13,4 +20,4 @@ if systemctl --help >/dev/null 2>&1; then | 34 | @@ -25,4 +33,4 @@ fi |
34 | fi | ||
35 | 35 | ||
36 | cd / | ||
36 | # Fall back to launching it ourselves. | 37 | # Fall back to launching it ourselves. |
37 | -exec rpc.statd --no-notify | 38 | -exec rpc.statd --no-notify |
38 | +exec rpc.statd --no-notify $STATDOPTS | 39 | +exec rpc.statd --no-notify $STATDOPTS |
39 | -- | 40 | -- |
40 | 1.9.1 | 41 | 2.6.6 |
41 | 42 | ||