diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon | 27 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb | 7 |
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 65fdd1dd4f..992267d5a1 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 | ||
32 | create_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 | ||
58 | start_statd(){ | 32 | start_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 |
75 | case "$1" in | 49 | case "$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 c813d7f61e..6e6d09bf42 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 | |||
@@ -54,7 +54,7 @@ SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service" | |||
54 | SYSTEMD_AUTO_ENABLE = "disable" | 54 | SYSTEMD_AUTO_ENABLE = "disable" |
55 | 55 | ||
56 | # --enable-uuid is need for cross-compiling | 56 | # --enable-uuid is need for cross-compiling |
57 | EXTRA_OECONF = "--with-statduser=nobody \ | 57 | EXTRA_OECONF = "--with-statduser=rpcuser \ |
58 | --enable-mountconfig \ | 58 | --enable-mountconfig \ |
59 | --enable-libmount-mount \ | 59 | --enable-libmount-mount \ |
60 | --disable-nfsv41 \ | 60 | --disable-nfsv41 \ |
@@ -90,7 +90,6 @@ do_compile_prepend() { | |||
90 | 90 | ||
91 | do_install_append () { | 91 | do_install_append () { |
92 | install -d ${D}${sysconfdir}/init.d | 92 | install -d ${D}${sysconfdir}/init.d |
93 | install -d ${D}${localstatedir}/lib/nfs/statd | ||
94 | install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver | 93 | install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver |
95 | install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon | 94 | install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon |
96 | 95 | ||
@@ -106,6 +105,10 @@ do_install_append () { | |||
106 | # kernel code as of 3.8 hard-codes this path as a default | 105 | # kernel code as of 3.8 hard-codes this path as a default |
107 | install -d ${D}/var/lib/nfs/v4recovery | 106 | install -d ${D}/var/lib/nfs/v4recovery |
108 | 107 | ||
108 | # chown the directories and files | ||
109 | chown -R rpcuser:rpcuser ${D}${localstatedir}/lib/nfs/statd | ||
110 | chmod 0644 ${D}${localstatedir}/lib/nfs/statd/state | ||
111 | |||
109 | # the following are built by CC_FOR_BUILD | 112 | # the following are built by CC_FOR_BUILD |
110 | rm -f ${D}${sbindir}/rpcdebug | 113 | rm -f ${D}${sbindir}/rpcdebug |
111 | rm -f ${D}${sbindir}/rpcgen | 114 | rm -f ${D}${sbindir}/rpcgen |