diff options
author | Roy.Li <rongqing.li@windriver.com> | 2012-12-24 09:02:04 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-31 09:43:24 +0000 |
commit | 9a1c99916bfc8b599e1fd567b0a61b979576b254 (patch) | |
tree | 6c553fc04f93d7ca1a6d3349036c59cac42d6c66 /meta/recipes-core | |
parent | 7f221da2a31e4ce661223b2d38e4c624d3dd1104 (diff) | |
download | poky-9a1c99916bfc8b599e1fd567b0a61b979576b254.tar.gz |
replace portmap with rpcbind.
Rpcbind has more features, like ipv6 support and nfs4 support;
Redhat, Fedora, debian, Ubuntu are using rpcbind by default.
(From OE-Core rev: 86ec57e2837465954f51fc55fce990b5ec6b1063)
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rwxr-xr-x | meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh | 16 | ||||
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-base.bb | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh index 82ec7f66eb..4fffe4e808 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | ### BEGIN INIT INFO | 2 | ### BEGIN INIT INFO |
3 | # Provides: mountnfs | 3 | # Provides: mountnfs |
4 | # Required-Start: $local_fs $network $portmap | 4 | # Required-Start: $local_fs $network $rpcbind |
5 | # Required-Stop: | 5 | # Required-Stop: |
6 | # Default-Start: S | 6 | # Default-Start: S |
7 | # Default-Stop: | 7 | # Default-Stop: |
@@ -17,9 +17,9 @@ test -f /etc/fstab && ( | |||
17 | # | 17 | # |
18 | # Read through fstab line by line. If it is NFS, set the flag | 18 | # Read through fstab line by line. If it is NFS, set the flag |
19 | # for mounting NFS filesystems. If any NFS partition is found and it | 19 | # for mounting NFS filesystems. If any NFS partition is found and it |
20 | # not mounted with the nolock option, we start the portmapper. | 20 | # not mounted with the nolock option, we start the rpcbind. |
21 | # | 21 | # |
22 | portmap=no | 22 | rpcbind=no |
23 | mount_nfs=no | 23 | mount_nfs=no |
24 | mount_smb=no | 24 | mount_smb=no |
25 | mount_ncp=no | 25 | mount_ncp=no |
@@ -45,7 +45,7 @@ do | |||
45 | *nolock*) | 45 | *nolock*) |
46 | ;; | 46 | ;; |
47 | *) | 47 | *) |
48 | portmap=yes | 48 | rpcbind=yes |
49 | ;; | 49 | ;; |
50 | esac | 50 | esac |
51 | fi | 51 | fi |
@@ -65,12 +65,12 @@ done | |||
65 | 65 | ||
66 | exec 0>&1 | 66 | exec 0>&1 |
67 | 67 | ||
68 | if test "$portmap" = yes | 68 | if test "$rpcbind" = yes |
69 | then | 69 | then |
70 | if test -x /sbin/portmap | 70 | if test -x /usr/sbin/rpcbind |
71 | then | 71 | then |
72 | echo -n "Starting portmapper... " | 72 | echo -n "Starting rpcbind... " |
73 | start-stop-daemon --start --quiet --exec /sbin/portmap | 73 | start-stop-daemon --start --quiet --exec /usr/sbin/rpcbind |
74 | sleep 2 | 74 | sleep 2 |
75 | fi | 75 | fi |
76 | fi | 76 | fi |
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 4ab34bbce4..100cc88be3 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb | |||
@@ -331,7 +331,7 @@ RRECOMMENDS_packagegroup-base-cramfs = "\ | |||
331 | # | 331 | # |
332 | SUMMARY_packagegroup-base-nfs = "NFS network filesystem support" | 332 | SUMMARY_packagegroup-base-nfs = "NFS network filesystem support" |
333 | RDEPENDS_packagegroup-base-nfs = "\ | 333 | RDEPENDS_packagegroup-base-nfs = "\ |
334 | portmap" | 334 | rpcbind" |
335 | 335 | ||
336 | RRECOMMENDS_packagegroup-base-nfs = "\ | 336 | RRECOMMENDS_packagegroup-base-nfs = "\ |
337 | kernel-module-nfs " | 337 | kernel-module-nfs " |