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

Forgot this commit the other day. The receiving end of the "boot -C" option.

Browse Source
This commit is contained in:
Poul-Henning Kamp 1995-04-23 04:14:41 +00:00
parent 453e527dcb
commit 94624c5572
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/amd64/amd64/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.22 1995/04/10 07:44:25 phk Exp $ * $Id: autoconf.c,v 1.23 1995/04/14 15:13:23 dufault Exp $
*/ */
/* /*
@ -88,7 +88,7 @@ int cd9660_mountroot __P((void));
#include <pci/pcivar.h> #include <pci/pcivar.h>
#endif #endif
#ifdef BOOTCDROM #ifdef CD9660
/* We need to try out all our potential CDROM drives, so we need a table. */ /* We need to try out all our potential CDROM drives, so we need a table. */
static struct { static struct {
char *name; char *name;
@ -116,7 +116,7 @@ find_cdrom_root()
} }
return EINVAL; return EINVAL;
} }
#endif #endif /* CD9660 */
#include "scbus.h" #include "scbus.h"
#if NSCBUS > 0 #if NSCBUS > 0
@ -159,16 +159,15 @@ configure()
configure_finish(); configure_finish();
#ifdef CD9660 #ifdef CD9660
#ifdef BOOTCDROM if ((boothowto & RB_CDROM) && !mountroot)
if (!mountroot) {
mountroot = find_cdrom_root; mountroot = find_cdrom_root;
}
#endif
#endif #endif
#ifdef NFS #ifdef NFS
if (!mountroot && nfs_diskless_valid) if (!mountroot && nfs_diskless_valid)
mountroot = nfs_mountroot; mountroot = nfs_mountroot;
#endif /* NFS */ #endif /* NFS */
#ifdef FFS #ifdef FFS
if (!mountroot) { if (!mountroot) {
mountroot = ffs_mountroot; mountroot = ffs_mountroot;

13
sys/i386/i386/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.22 1995/04/10 07:44:25 phk Exp $ * $Id: autoconf.c,v 1.23 1995/04/14 15:13:23 dufault Exp $
*/ */
/* /*
@ -88,7 +88,7 @@ int cd9660_mountroot __P((void));
#include <pci/pcivar.h> #include <pci/pcivar.h>
#endif #endif
#ifdef BOOTCDROM #ifdef CD9660
/* We need to try out all our potential CDROM drives, so we need a table. */ /* We need to try out all our potential CDROM drives, so we need a table. */
static struct { static struct {
char *name; char *name;
@ -116,7 +116,7 @@ find_cdrom_root()
} }
return EINVAL; return EINVAL;
} }
#endif #endif /* CD9660 */
#include "scbus.h" #include "scbus.h"
#if NSCBUS > 0 #if NSCBUS > 0
@ -159,16 +159,15 @@ configure()
configure_finish(); configure_finish();
#ifdef CD9660 #ifdef CD9660
#ifdef BOOTCDROM if ((boothowto & RB_CDROM) && !mountroot)
if (!mountroot) {
mountroot = find_cdrom_root; mountroot = find_cdrom_root;
}
#endif
#endif #endif
#ifdef NFS #ifdef NFS
if (!mountroot && nfs_diskless_valid) if (!mountroot && nfs_diskless_valid)
mountroot = nfs_mountroot; mountroot = nfs_mountroot;
#endif /* NFS */ #endif /* NFS */
#ifdef FFS #ifdef FFS
if (!mountroot) { if (!mountroot) {
mountroot = ffs_mountroot; mountroot = ffs_mountroot;