diff --git a/nfs-utils.spec b/nfs-utils.spec index 881cba2..1209b28 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.2.4 -Release: 0%{?dist} +Release: 1%{?dist} Epoch: 1 # group all 32bit related archs @@ -250,6 +250,10 @@ fi %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Mon Jul 4 2011 J. Bruce Fields 1.2.4-2 +- Rely on crypto module autoloading in init scripts +- initscripts: just try to mount rpc_pipefs always + * Wed Jun 29 2011 Steve Dickson 1.2.4-0 - Updated to latest upstream release: nfs-utils-1-2-4 diff --git a/rpcgssd.init b/rpcgssd.init index 86e621b..4428b50 100755 --- a/rpcgssd.init +++ b/rpcgssd.init @@ -54,23 +54,16 @@ case "$1" in rm -f $LOCKFILE echo -n $"Starting RPC gssd: " - # List of kernel modules to load - [ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5" - # Make sure the rpc_pipefs filesystem is available /bin/mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 - [ "${SECURE_NFS_MODS}" != "noload" ] && { - [ -x /sbin/lsmod -a -x /sbin/modprobe ] && { - for i in ${SECURE_NFS_MODS}; do - if ! /sbin/lsmod | grep $i > /dev/null ; then - /sbin/modprobe $i || { - echo "Error: Unable to load '$i' security module." - exit 6; - } - fi - done - } + [ -x /sbin/lsmod -a -x /sbin/modprobe ] && { + if ! /sbin/lsmod | grep rpcsec_gss_krb5 > /dev/null ; then + /sbin/modprobe rpcsec_gss_krb5 || { + echo "Error: Unable to load rpcsec_gss_krb5." + exit 6; + } + fi } # Start daemon. diff --git a/rpcsvcgssd.init b/rpcsvcgssd.init index 96d4c43..30b7cd8 100755 --- a/rpcsvcgssd.init +++ b/rpcsvcgssd.init @@ -47,25 +47,17 @@ case "$1" in rm -f $LOCKFILE echo -n $"Starting RPC svcgssd: " - # List of kernel modules to load - [ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5" # Make sure the rpc_pipefs filesystem is available /bin/mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 - [ "${SECURE_NFS_MODS}" != "noload" ] && { - [ -x /sbin/lsmod -a -x /sbin/modprobe ] && { - # Load rpcsec modules - for i in ${SECURE_NFS_MODS} - do - if ! /sbin/lsmod | grep $i > /dev/null ; then - /sbin/modprobe $i || { - echo "Error: Unable to load '$i' security module." - exit 6; - } - fi - done - } + [ -x /sbin/lsmod -a -x /sbin/modprobe ] && { + if ! /sbin/lsmod | grep rpcsec_gss_krb5 > /dev/null ; then + /sbin/modprobe rpcsec_gss_krb5 || { + echo "Error: Unable to load rpcsec_gss_krb5." + exit 6; + } + fi } # Start daemon.