Fix module names and dependencies so the NFS clients will

load correctly as modules after r221124.
This commit is contained in:
Rick Macklem 2011-04-27 20:42:30 +00:00
parent 8adcbaed13
commit afea74655f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=221139
3 changed files with 11 additions and 7 deletions

View File

@ -13,7 +13,7 @@ name="nfsclient"
rcvar="nfs_client_enable"
start_cmd="nfsclient_start"
stop_cmd="unmount_all"
required_modules="nfsclient:nfs"
required_modules="nfsclient:oldnfs"
nfsclient_start()
{

View File

@ -134,7 +134,11 @@ static struct vfsops nfs_vfsops = {
VFS_SET(nfs_vfsops, nfs, VFCF_NETWORK);
/* So that loader and kldload(2) can find us, wherever we are.. */
MODULE_VERSION(newnfs, 1);
MODULE_VERSION(nfs, 1);
MODULE_DEPEND(nfs, nfscommon, 1, 1, 1);
MODULE_DEPEND(nfs, krpc, 1, 1, 1);
MODULE_DEPEND(nfs, nfssvc, 1, 1, 1);
MODULE_DEPEND(nfs, nfslock, 1, 1, 1);
/*
* This structure is now defined in sys/nfs/nfs_diskless.c so that it

View File

@ -147,13 +147,13 @@ static struct vfsops nfs_vfsops = {
VFS_SET(nfs_vfsops, oldnfs, VFCF_NETWORK);
/* So that loader and kldload(2) can find us, wherever we are.. */
MODULE_VERSION(nfs, 1);
MODULE_DEPEND(nfs, krpc, 1, 1, 1);
MODULE_VERSION(oldnfs, 1);
MODULE_DEPEND(oldnfs, krpc, 1, 1, 1);
#ifdef KGSSAPI
MODULE_DEPEND(nfs, kgssapi, 1, 1, 1);
MODULE_DEPEND(oldnfs, kgssapi, 1, 1, 1);
#endif
MODULE_DEPEND(nfs, nfs_common, 1, 1, 1);
MODULE_DEPEND(nfs, nfslock, 1, 1, 1);
MODULE_DEPEND(oldnfs, nfs_common, 1, 1, 1);
MODULE_DEPEND(oldnfs, nfslock, 1, 1, 1);
static struct nfs_rpcops nfs_rpcops = {
nfs_readrpc,