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

Re-implement the handing of RB_CDROM in a machine-independant fashion.

Browse Source 
We currently only search SCSI and IDE CDROMs; if there's felt to be a
need for supporting the very old and rare soundcard etc. drives for this
application they can be trivially added.
This commit is contained in:
msmith 1999-11-04 01:40:18 +00:00
parent bcba2990f6
commit bd93bea682
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/kern/vfs_conf.c
View File

@ -61,6 +61,16 @@ MALLOC_DEFINE(M_MOUNT, "mount", "vfs mount structure");
struct vnode *rootvnode;
/*
* The root specifiers we will try if RB_CDROM is specified.
*/
static char *cdrom_rootdevnames[] = {
"cd9660:cd0a",
"cd9660:acd0a",
"cd9660:wcd0a",
NULL
};
static void vfs_mountroot(void *junk);
static int vfs_mountroot_try(char *mountfrom);
static int vfs_mountroot_ask(void);
@ -78,6 +88,8 @@ SYSINIT(mountroot, SI_SUB_MOUNT_ROOT, SI_ORDER_SECOND, vfs_mountroot, NULL);
static void
vfs_mountroot(void *junk)
{
int i;
/*
* The root filesystem information is compiled in, and we are
* booted with instructions to use it.
@ -96,6 +108,18 @@ vfs_mountroot(void *junk)
return;
}
/*
* We've been given the generic "use CDROM as root" flag. This is
* necessary because one media may be used in many different
* devices, so we need to search for them.
*/
if (boothowto & RB_CDROM) {
for (i = 0; cdrom_rootdevnames[i] != NULL; i++) {
if (!vfs_mountroot_try(cdrom_rootdevnames[i]))
return;
}
}
/*
* Try to use the value read by the loader from /etc/fstab, or
* supplied via some other means. This is the preferred

24
sys/kern/vfs_mount.c
View File

@ -61,6 +61,16 @@ MALLOC_DEFINE(M_MOUNT, "mount", "vfs mount structure");
struct vnode *rootvnode;
/*
* The root specifiers we will try if RB_CDROM is specified.
*/
static char *cdrom_rootdevnames[] = {
"cd9660:cd0a",
"cd9660:acd0a",
"cd9660:wcd0a",
NULL
};
static void vfs_mountroot(void *junk);
static int vfs_mountroot_try(char *mountfrom);
static int vfs_mountroot_ask(void);
@ -78,6 +88,8 @@ SYSINIT(mountroot, SI_SUB_MOUNT_ROOT, SI_ORDER_SECOND, vfs_mountroot, NULL);
static void
vfs_mountroot(void *junk)
{
int i;
/*
* The root filesystem information is compiled in, and we are
* booted with instructions to use it.
@ -96,6 +108,18 @@ vfs_mountroot(void *junk)
return;
}
/*
* We've been given the generic "use CDROM as root" flag. This is
* necessary because one media may be used in many different
* devices, so we need to search for them.
*/
if (boothowto & RB_CDROM) {
for (i = 0; cdrom_rootdevnames[i] != NULL; i++) {
if (!vfs_mountroot_try(cdrom_rootdevnames[i]))
return;
}
}
/*
* Try to use the value read by the loader from /etc/fstab, or
* supplied via some other means. This is the preferred