system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-22 17:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scan cdevs for potential root devices, rather than bdevs.

Browse source
This commit is contained in:
Poul-Henning Kamp 1999-12-08 10:01:18 +00:00
parent f49e572bbe
commit e8452d59e3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=54298
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/kern/vfs_conf.c
View file

@ -200,7 +200,8 @@ vfs_mountroot_try(char *mountfrom)
printf("setrootbyname failed\n");
/* If the root device is a type "memory disk", mount RW */
if (rootdev != NODEV && devsw(rootdev) && (devsw(rootdev)->d_flags & D_MEMDISK))
if (rootdev != NODEV && devsw(rootdev) &&
(devsw(rootdev)->d_flags & D_MEMDISK))
mp->mnt_flag &= ~MNT_RDONLY;
error = VFS_MOUNT(mp, NULL, NULL, NULL, curproc);
@ -253,7 +254,7 @@ vfs_mountroot_ask(void)
if (name[0] == '?') {
printf("Possibly valid devices for 'ufs' root:\n");
for (i = 0; i < NUMCDEVSW; i++) {
dev = makebdev(i, 0);
dev = makedev(i, 0);
if (devsw(dev) != NULL)
printf(" \"%s\"", devsw(dev)->d_name);
}
@ -311,7 +312,7 @@ static int
setrootbyname(char *name)
{
char *cp;
int bd, unit, slice, part;
int cd, unit, slice, part;
dev_t dev;
slice = 0;
@ -333,8 +334,8 @@ setrootbyname(char *name)
}
unit = *cp - '0';
*cp++ = '\0';
for (bd = 0; bd < NUMCDEVSW; bd++) {
dev = makebdev(bd, 0);
for (cd = 0; cd < NUMCDEVSW; cd++) {
dev = makedev(cd, 0);
if (devsw(dev) != NULL &&
strcmp(devsw(dev)->d_name, name) == 0)
goto gotit;
@ -356,7 +357,7 @@ setrootbyname(char *name)
printf("junk after name\n");
return (1);
}
rootdev = makebdev(bd, dkmakeminor(unit, slice, part));
rootdev = makedev(cd, dkmakeminor(unit, slice, part));
return 0;
}

13
sys/kern/vfs_mount.c
View file

@ -200,7 +200,8 @@ vfs_mountroot_try(char *mountfrom)
printf("setrootbyname failed\n");
/* If the root device is a type "memory disk", mount RW */
if (rootdev != NODEV && devsw(rootdev) && (devsw(rootdev)->d_flags & D_MEMDISK))
if (rootdev != NODEV && devsw(rootdev) &&
(devsw(rootdev)->d_flags & D_MEMDISK))
mp->mnt_flag &= ~MNT_RDONLY;
error = VFS_MOUNT(mp, NULL, NULL, NULL, curproc);
@ -253,7 +254,7 @@ vfs_mountroot_ask(void)
if (name[0] == '?') {
printf("Possibly valid devices for 'ufs' root:\n");
for (i = 0; i < NUMCDEVSW; i++) {
dev = makebdev(i, 0);
dev = makedev(i, 0);
if (devsw(dev) != NULL)
printf(" \"%s\"", devsw(dev)->d_name);
}
@ -311,7 +312,7 @@ static int
setrootbyname(char *name)
{
char *cp;
int bd, unit, slice, part;
int cd, unit, slice, part;
dev_t dev;
slice = 0;
@ -333,8 +334,8 @@ setrootbyname(char *name)
}
unit = *cp - '0';
*cp++ = '\0';
for (bd = 0; bd < NUMCDEVSW; bd++) {
dev = makebdev(bd, 0);
for (cd = 0; cd < NUMCDEVSW; cd++) {
dev = makedev(cd, 0);
if (devsw(dev) != NULL &&
strcmp(devsw(dev)->d_name, name) == 0)
goto gotit;
@ -356,7 +357,7 @@ setrootbyname(char *name)
printf("junk after name\n");
return (1);
}
rootdev = makebdev(bd, dkmakeminor(unit, slice, part));
rootdev = makedev(cd, dkmakeminor(unit, slice, part));
return 0;
}