From 966255697cf8b5d0641c67fb60adf031b1f9dd0b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 28 Aug 2007 13:53:58 +0000 Subject: nfs-utils: do not check for nfsd kernel module as it can be built-in into kernel. (Taken from Poky - r1395) --- packages/nfs-utils/files/nfsserver | 2 -- packages/nfs-utils/nfs-utils_1.0.6.bb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'packages/nfs-utils') diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver index 4ff75916d0..bb16806ed9 100644 --- a/packages/nfs-utils/files/nfsserver +++ b/packages/nfs-utils/files/nfsserver @@ -2,8 +2,6 @@ # # Startup script for nfs-utils # -# The nfsd kernel module must exist along with its dependencies -modprobe -n nfsd || exit 0 # # The environment variable NFS_SERVERS may be set in /etc/default/nfsd # Other control variables may be overridden here too diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index a941843488..012679b8b9 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "userspace utilities for kernel nfs" PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "r9" +PR = "r10" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ -- cgit v1.2.3 From 50bf42c0ac01c39b677caf3e7a8c2280f04703cc Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 28 Aug 2007 13:55:11 +0000 Subject: nfs-utils: Add patch to work with uclibc (Taken from Poky -r1796) --- packages/nfs-utils/files/uclibc_bzero_fix.patch | 68 +++++++++++++++++++++++++ packages/nfs-utils/nfs-utils_1.0.6.bb | 3 +- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 packages/nfs-utils/files/uclibc_bzero_fix.patch (limited to 'packages/nfs-utils') diff --git a/packages/nfs-utils/files/uclibc_bzero_fix.patch b/packages/nfs-utils/files/uclibc_bzero_fix.patch new file mode 100644 index 0000000000..9a276d326e --- /dev/null +++ b/packages/nfs-utils/files/uclibc_bzero_fix.patch @@ -0,0 +1,68 @@ +--- + support/nfs/svc_socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nfs-utils-1.0.6/support/nfs/svc_socket.c +=================================================================== +--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c 2007-05-27 16:14:09.000000000 +0100 ++++ nfs-utils-1.0.6/support/nfs/svc_socket.c 2007-05-28 22:43:55.000000000 +0100 +@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int + } + } + +- __bzero ((char *) &addr, sizeof (addr)); ++ memset ((char *) &addr,0, sizeof (addr)); + addr.sin_family = AF_INET; + + #ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ +--- + support/nfs/svc_socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nfs-utils-1.0.6/support/nfs/svc_socket.c +=================================================================== +--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c 2007-05-27 16:14:09.000000000 +0100 ++++ nfs-utils-1.0.6/support/nfs/svc_socket.c 2007-05-28 22:43:55.000000000 +0100 +@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int + } + } + +- __bzero ((char *) &addr, sizeof (addr)); ++ memset ((char *) &addr,0, sizeof (addr)); + addr.sin_family = AF_INET; + + #ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ +--- + support/nfs/svc_socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nfs-utils-1.0.6/support/nfs/svc_socket.c +=================================================================== +--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c 2007-05-27 16:14:09.000000000 +0100 ++++ nfs-utils-1.0.6/support/nfs/svc_socket.c 2007-05-28 22:43:55.000000000 +0100 +@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int + } + } + +- __bzero ((char *) &addr, sizeof (addr)); ++ memset ((char *) &addr,0, sizeof (addr)); + addr.sin_family = AF_INET; + + #ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ +--- + support/nfs/svc_socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nfs-utils-1.0.6/support/nfs/svc_socket.c +=================================================================== +--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c 2007-05-27 16:14:09.000000000 +0100 ++++ nfs-utils-1.0.6/support/nfs/svc_socket.c 2007-05-28 22:43:55.000000000 +0100 +@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int + } + } + +- __bzero ((char *) &addr, sizeof (addr)); ++ memset ((char *) &addr,0, sizeof (addr)); + addr.sin_family = AF_INET; + + #ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index 012679b8b9..fbc2a96a3c 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "userspace utilities for kernel nfs" PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "r10" +PR = "r11" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ @@ -10,6 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://stat-include.patch;patch=1 \ file://nfs-utils-1.0.6-uclibc.patch;patch=1 \ file://kernel-2.6.18+.patch;patch=1 \ + file://uclibc_bzero_fix.patch;patch=1 \ file://nfsserver \ file://forgotten-defines" -- cgit v1.2.3 From edbeb005cd8711b6deef2c46d74b4057d2df0ed3 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 28 Aug 2007 13:58:00 +0000 Subject: nfs-utils: start/stop also statd so clients will be able to do locking (Taken from Poky -r2578) - close #2799 --- packages/nfs-utils/files/nfsserver | 21 ++++++++++++++++++++- packages/nfs-utils/nfs-utils_1.0.6.bb | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) (limited to 'packages/nfs-utils') diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver index bb16806ed9..0e9d7be787 100644 --- a/packages/nfs-utils/files/nfsserver +++ b/packages/nfs-utils/files/nfsserver @@ -7,9 +7,10 @@ # Other control variables may be overridden here too test -r /etc/default/nfsd && . /etc/default/nfsd # -# Location of exectuables: +# Location of executables: test -x "$NFS_MOUNTD" || NFS_MOUNTD=/usr/sbin/mountd test -x "$NFS_NFSD" || NFS_NFSD=/usr/sbin/nfsd +test -x "$NFS_STATD" || NFS_STATD=/usr/sbin/statd # # The user mode program must also exist (it just starts the kernel # threads using the kernel module code). @@ -104,6 +105,20 @@ stop_nfsd(){ echo failed fi } + +#statd +start_statd(){ + echo -n "starting statd: " + start-stop-daemon --start --exec "$NFS_STATD" + echo done +} +stop_statd(){ + # WARNING: this kills any process with the executable + # name 'statd'. + echo -n 'stopping statd: ' + start-stop-daemon --stop --quiet --signal 1 --name statd + echo done +} #---------------------------------------------------------------------- # # supported options: @@ -116,15 +131,19 @@ case "$1" in start) create_directories start_nfsd "$NFS_SERVERS" start_mountd + start_statd test -r /etc/exports && exportfs -a;; stop) exportfs -ua + stop_statd stop_mountd stop_nfsd;; reload) test -r /etc/exports && exportfs -r;; restart)exportfs -ua stop_mountd + stop_statd # restart does not restart the kernel threads, # only the user mode processes start_mountd + start_statd test -r /etc/exports && exportfs -a;; esac diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index fbc2a96a3c..15e3914472 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "userspace utilities for kernel nfs" PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "r11" +PR = "r12" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ -- cgit v1.2.3