From d2f08956eca27ce14b34dfcf8270c045e69b3f85 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Thu, 28 Dec 1995 21:56:49 +0000 Subject: [PATCH] Don't print swap server as root server. Submitted by: Mattias.Gronlund@sa.erisoft.se (Mattias Gronlund) --- sys/nfs/nfs_vfsops.c | 4 ++-- sys/nfsclient/nfs_vfsops.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index 85faa625d9db..df4a562b3229 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_vfsops.c,v 1.24 1995/12/17 21:12:35 phk Exp $ + * $Id: nfs_vfsops.c,v 1.25 1995/12/22 15:57:38 phk Exp $ */ #include @@ -428,7 +428,7 @@ nfs_mountroot() * If using nfsv3_diskless, replace NFSX_V2FH with nd->root_fhsize. */ nd->root_args.fhsize = NFSX_V2FH; - l = ntohl(nd->swap_saddr.sin_addr.s_addr); + l = ntohl(nd->root_saddr.sin_addr.s_addr); sprintf(buf,"%ld.%ld.%ld.%ld:%s", (l >> 24) & 0xff, (l >> 16) & 0xff, (l >> 8) & 0xff, (l >> 0) & 0xff,nd->root_hostnam); diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 85faa625d9db..df4a562b3229 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_vfsops.c,v 1.24 1995/12/17 21:12:35 phk Exp $ + * $Id: nfs_vfsops.c,v 1.25 1995/12/22 15:57:38 phk Exp $ */ #include @@ -428,7 +428,7 @@ nfs_mountroot() * If using nfsv3_diskless, replace NFSX_V2FH with nd->root_fhsize. */ nd->root_args.fhsize = NFSX_V2FH; - l = ntohl(nd->swap_saddr.sin_addr.s_addr); + l = ntohl(nd->root_saddr.sin_addr.s_addr); sprintf(buf,"%ld.%ld.%ld.%ld:%s", (l >> 24) & 0xff, (l >> 16) & 0xff, (l >> 8) & 0xff, (l >> 0) & 0xff,nd->root_hostnam);