summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-11-07 08:47:19 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-09 10:21:22 (GMT)
commit8f9ed2407f907e4bc66a11c8454e8d060afdae31 (patch)
tree014f2e443ca6ddaf6f5d7da16388bf78d0b1108e /meta/recipes-connectivity
parent5fe3954013771a9f1cd1df63a6fd6ca5c470c7ad (diff)
downloadpoky-8f9ed2407f907e4bc66a11c8454e8d060afdae31.tar.gz
nfs-utils: change owner/group of directories in do_install
Previously, the owners/groups of directories like /var/lib/nfs/statd are changed in the init script, /etc/init.d/nfscommon. This is actually a workaround. We need to change them at do_install time. This patch fixes the above problem by changing owners/groups at do_install time. Besides, configuration option '--with-staduser=nobody' is changed to be '--with-statduser=rpcuser'. And /var/lib/nfs/statd/state is modified to have permission 0644, just like other distros (ubuntu, fedora, etc.) do. (From OE-Core rev: 8c27a1e25ae42a435ab7d290cab40f94f9286243) Signed-off-by: Chen Qi <Qi.Chen@windriver.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')
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon27
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb7
2 files changed, 5 insertions, 29 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
index 65fdd1d..992267d 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
@@ -28,33 +28,7 @@ test -n "$NFS_STATEDIR" || NFS_STATEDIR=/var/lib/nfs
28#---------------------------------------------------------------------- 28#----------------------------------------------------------------------
29# Startup and shutdown functions. 29# Startup and shutdown functions.
30# Actual startup/shutdown is at the end of this file. 30# Actual startup/shutdown is at the end of this file.
31#directories
32create_directories(){
33 echo -n 'creating NFS state directory: '
34 mkdir -p "$NFS_STATEDIR"
35 ( cd "$NFS_STATEDIR"
36 umask 077
37 mkdir -p rpc_pipefs
38 mkdir -p sm sm.bak statd
39 chown rpcuser:rpcuser sm sm.bak statd
40 test -w statd/state || {
41 rm -f statd/state
42 :>statd/state
43 }
44 umask 022
45 for file in xtab etab smtab rmtab
46 do
47 test -w "$file" || {
48 rm -f "$file"
49 :>"$file"
50 }
51 done
52 )
53 chown rpcuser:rpcuser "$NFS_STATEDIR"
54 echo done
55}
56 31
57#statd
58start_statd(){ 32start_statd(){
59 echo -n "starting statd: " 33 echo -n "starting statd: "
60 start-stop-daemon --start --exec "$NFS_STATD" --pidfile "$STATD_PID" 34 start-stop-daemon --start --exec "$NFS_STATD" --pidfile "$STATD_PID"
@@ -74,7 +48,6 @@ stop_statd(){
74#FIXME: need to create the /var/lib/nfs/... directories 48#FIXME: need to create the /var/lib/nfs/... directories
75case "$1" in 49case "$1" in
76 start) 50 start)
77 create_directories
78 start_statd;; 51 start_statd;;
79 stop) 52 stop)
80 stop_statd;; 53 stop_statd;;
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 4933e10..37a2e1a 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
@@ -56,7 +56,7 @@ SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service"
56SYSTEMD_AUTO_ENABLE = "disable" 56SYSTEMD_AUTO_ENABLE = "disable"
57 57
58# --enable-uuid is need for cross-compiling 58# --enable-uuid is need for cross-compiling
59EXTRA_OECONF = "--with-statduser=nobody \ 59EXTRA_OECONF = "--with-statduser=rpcuser \
60 --enable-mountconfig \ 60 --enable-mountconfig \
61 --enable-libmount-mount \ 61 --enable-libmount-mount \
62 --disable-nfsv41 \ 62 --disable-nfsv41 \
@@ -92,7 +92,6 @@ do_compile_prepend() {
92 92
93do_install_append () { 93do_install_append () {
94 install -d ${D}${sysconfdir}/init.d 94 install -d ${D}${sysconfdir}/init.d
95 install -d ${D}${localstatedir}/lib/nfs/statd
96 install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver 95 install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
97 install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon 96 install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon
98 97
@@ -108,6 +107,10 @@ do_install_append () {
108 # kernel code as of 3.8 hard-codes this path as a default 107 # kernel code as of 3.8 hard-codes this path as a default
109 install -d ${D}/var/lib/nfs/v4recovery 108 install -d ${D}/var/lib/nfs/v4recovery
110 109
110 # chown the directories and files
111 chown -R rpcuser:rpcuser ${D}${localstatedir}/lib/nfs/statd
112 chmod 0644 ${D}${localstatedir}/lib/nfs/statd/state
113
111 # the following are built by CC_FOR_BUILD 114 # the following are built by CC_FOR_BUILD
112 rm -f ${D}${sbindir}/rpcdebug 115 rm -f ${D}${sbindir}/rpcdebug
113 rm -f ${D}${sbindir}/rpcgen 116 rm -f ${D}${sbindir}/rpcgen