- change detection of nfs4; load nfs module in nfsfs.init

Changed files:
    nfs.init -> 1.28
    nfsfs.init -> 1.25

diff --git a/nfs.init b/nfs.init
index f9822936b42e8abeb99fbb80d29a6cb49f03e034..c010c277dbaa97aff27618398260481718e5b8f1 100644 (file)
--- a/nfs.init
+++ b/nfs.init
@@ -63,7 +63,7 @@ case "$1" in
                        daemon /usr/sbin/exportfs -r
                        msg_starting "NFS mountd"
                        daemon rpc.mountd $RPCMOUNTOPTIONS
-                       if (grep -q nfs4 /proc/filesystems); then
+                       if (grep -q rpc_pipefs /proc/filesystems); then
                            if [ ! -f /var/lock/subsys/idmapd ]; then
                                msg_starting "NFS idmapd"
                                daemon rpc.idmapd $RPCIDMAPOPTIONS
@@ -93,7 +93,7 @@ case "$1" in
                        killproc rpc.mountd
                        msg_stopping "NFS daemon"
                        killproc nfsd -QUIT
-                       if (grep -q nfs4 /proc/filesystems); then
+                       if (grep -q rpc_pipefs /proc/filesystems); then
                            msg_stopping "NFS svcgssd"
                            killproc rpc.svcgssd
                            if [ -f /var/lock/subsys/idmapd -a ! -f /var/lock/subsys/nfsfs ]; then

diff --git a/nfsfs.init b/nfsfs.init
index 4fc4b5ec8a03cb4022cc3dc0b45095b1242984f1..edd90a38650d096739d549f84d41a8b6bf7b7bba 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -39,6 +39,7 @@ case "$1" in
   start)
        if [ ! -f /var/lock/subsys/nfsfs ]; then
            if [ "$NFSDTYPE" != "U" ] && grep -q nfs4 /proc/filesystems; then
+               modprobe -s nfs > /dev/null 2>&1
                if [ "$(kernelverser)" -ge "002006" ]; then
                    grep -q rpc_pipefs /proc/filesystems && \
                    ! grep -q rpc_pipefs /proc/mounts && \