From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 8f548dfe366e63af924e559a9275ce734a099942
Date: Fri, 03 Apr 2015 19:19:50 +0200
Message-ID: <20150403171950.4B44A21ADD@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3122767118987897116=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3122767118987897116==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  8f548dfe366e63af924e559a9275ce734a099942 (commit)
       via  668ea5d311f10b63dd69718b9a43aa5d03029d5d (commit)
      from  0d573e226f956e32035a41674e6f79e169305172 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8f548dfe366e63af924e559a9275ce734a099942
Merge: 0d573e2 668ea5d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri Apr 3 19:19:34 2015 +0200

    Merge branch 'nfs-server-fix' into next

commit 668ea5d311f10b63dd69718b9a43aa5d03029d5d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri Apr 3 18:59:12 2015 +0200

    nfs-server: Fix kernel version check in initscript.
   =20
    nfsd requires a mounted nfsd filesystem which has been introduced in
    the kernel 2.6 tree. To determine the current running kernel, a check
    was included in the initscript which works fine until we switched to a ke=
rnel
    version 3.x.
   =20
    This commit fixes this check, so the nfs-server will startup again.
   =20
    Fixes #10760.

-----------------------------------------------------------------------

Summary of changes:
 lfs/nfs                           | 2 +-
 src/initscripts/init.d/nfs-server | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/lfs/nfs b/lfs/nfs
index d18487b..417f155 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D nfs
-PAK_VER    =3D 5
+PAK_VER    =3D 6
=20
 DEPS       =3D "portmap"
=20
diff --git a/src/initscripts/init.d/nfs-server b/src/initscripts/init.d/nfs-s=
erver
index 397722c..41055ad 100644
--- a/src/initscripts/init.d/nfs-server
+++ b/src/initscripts/init.d/nfs-server
@@ -27,8 +27,8 @@ case "$1" in
 			loadproc /usr/sbin/rpc.rquotad
 		fi
=20
-		# NFSD support only in 2.6 kernel
-		/bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null
+		# NFSD support requires kernel 2.6 or newer.
+		/bin/uname -r | /bin/grep -E "^2.6|^3" 2>&1 > /dev/null
 		if [ $? =3D 0 ]; then
 			boot_mesg "Mounting nfsd virtual filesystem..."
 			/bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
@@ -62,8 +62,8 @@ case "$1" in
 		/usr/sbin/exportfs -au 2>&1 > /dev/null
 		evaluate_retval
=20
-		# NFSD support only in 2.6 kernel
-                /bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null
+		# NFSD support requires kernel 2.6 or newer.
+                /bin/uname -r | /bin/grep -E "^2.6|^3" 2>&1 > /dev/null
                 if [ $? =3D 0 ]; then
 			boot_mesg "Unmounting NFS Virtual Filesystem..."
 			/bin/umount /proc/fs/nfsd 2>&1 > /dev/null


hooks/post-receive
--
IPFire 2.x development tree

--===============3122767118987897116==--