d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out my previous change (phk didn't like it) in favour of setting

Browse Source 
rootdev in the mfs initialisation code iff MFS_ROOT (which Bruce doesn't
like). Damned if I do - damned if I don't.
This commit is contained in:
jb 1999-05-24 00:37:26 +00:00
parent 62b04b83d2
commit 60b7529f2d
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/vfs_conf.c
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94
* $Id: vfs_conf.c,v 1.26 1998/09/14 19:56:40 sos Exp $
* $Id: vfs_conf.c,v 1.27 1999/05/23 10:51:33 jb Exp $
*/
/*
@ -52,7 +52,6 @@
* on SMP reentrancy
*/
#include "opt_bootp.h"
#include "opt_mfs.h"
#include <sys/param.h> /* dev_t (types.h)*/
#include <sys/kernel.h>
@ -119,10 +118,8 @@ vfs_mountrootfs(void *unused)
struct mount *mp;
int err;
struct proc *p = curproc; /* XXX */
#ifndef MFS_ROOT
int i;
dev_t orootdev;
#endif
#ifdef BOOTP
bootpc_init();
@ -140,9 +137,6 @@ vfs_mountrootfs(void *unused)
/*
* Attempt the mount
*/
#ifdef MFS_ROOT
err = VFS_MOUNT(mp, NULL, NULL, NULL, p);
#else
err = ENXIO;
orootdev = rootdev;
if (rootdevs[0] == NODEV)
@ -161,7 +155,6 @@ vfs_mountrootfs(void *unused)
if (err != ENXIO)
break;
}
#endif
if (err) {
/*
* XXX should ask the user for the name in some cases.

9
sys/kern/vfs_mount.c
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94
* $Id: vfs_conf.c,v 1.26 1998/09/14 19:56:40 sos Exp $
* $Id: vfs_conf.c,v 1.27 1999/05/23 10:51:33 jb Exp $
*/
/*
@ -52,7 +52,6 @@
* on SMP reentrancy
*/
#include "opt_bootp.h"
#include "opt_mfs.h"
#include <sys/param.h> /* dev_t (types.h)*/
#include <sys/kernel.h>
@ -119,10 +118,8 @@ vfs_mountrootfs(void *unused)
struct mount *mp;
int err;
struct proc *p = curproc; /* XXX */
#ifndef MFS_ROOT
int i;
dev_t orootdev;
#endif
#ifdef BOOTP
bootpc_init();
@ -140,9 +137,6 @@ vfs_mountrootfs(void *unused)
/*
* Attempt the mount
*/
#ifdef MFS_ROOT
err = VFS_MOUNT(mp, NULL, NULL, NULL, p);
#else
err = ENXIO;
orootdev = rootdev;
if (rootdevs[0] == NODEV)
@ -161,7 +155,6 @@ vfs_mountrootfs(void *unused)
if (err != ENXIO)
break;
}
#endif
if (err) {
/*
* XXX should ask the user for the name in some cases.