diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2011-04-27 20:42:30 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2011-04-27 20:42:30 +0000 |
| commit | c44593a0a41a8d24665e3e0f763f60ee0f328cd4 (patch) | |
| tree | 0b5bfcf4b52f034f0200677a1543235f9e1c074c | |
| parent | da3b304fc1e3776979accc2d8a8e24dfc299fb05 (diff) | |
| download | FreeBSD-src-c44593a0a41a8d24665e3e0f763f60ee0f328cd4.zip FreeBSD-src-c44593a0a41a8d24665e3e0f763f60ee0f328cd4.tar.gz | |
Fix module names and dependencies so the NFS clients will
load correctly as modules after r221124.
| -rwxr-xr-x | etc/rc.d/nfsclient | 2 | ||||
| -rw-r--r-- | sys/fs/nfsclient/nfs_clvfsops.c | 6 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 10 |
3 files changed, 11 insertions, 7 deletions
diff --git a/etc/rc.d/nfsclient b/etc/rc.d/nfsclient index d28e45f..c97a52a 100755 --- a/etc/rc.d/nfsclient +++ b/etc/rc.d/nfsclient @@ -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() { diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 476753d..9f4ba72 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -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 diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index cd33b04..ec60c94 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -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, |
