diff options
| author | ghelmer <ghelmer@FreeBSD.org> | 1999-06-04 03:18:28 +0000 |
|---|---|---|
| committer | ghelmer <ghelmer@FreeBSD.org> | 1999-06-04 03:18:28 +0000 |
| commit | b7771a65a4fcc61bc2336a1d0abf2bfb7f2ab603 (patch) | |
| tree | cd2f8322329ae6dcfa17673de3b0a08ce9d535d9 /sys | |
| parent | 3176b666ac8a5b03cab62efbe2207d9a5caece70 (diff) | |
| download | FreeBSD-src-b7771a65a4fcc61bc2336a1d0abf2bfb7f2ab603.zip FreeBSD-src-b7771a65a4fcc61bc2336a1d0abf2bfb7f2ab603.tar.gz | |
Modify the boot loader to recognize the -C flag and pass the RB_CDROM
flag to the kernel to mount a CDROM as the root filesystem. Alternatively,
the boot_cdrom env var can be set.
As Mike Smith noted, "-C is the "wrong" way to do this", but this is
an acceptable stopgap in lieu of a better way.
PR: bin/11884
Reviewed by: msmith@freebsd.org
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/i386/libi386/bootinfo.c | 6 | ||||
| -rw-r--r-- | sys/boot/i386/libi386/bootinfo32.c | 6 | ||||
| -rw-r--r-- | sys/boot/i386/libi386/bootinfo64.c | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c index 87405f0..045102a 100644 --- a/sys/boot/i386/libi386/bootinfo.c +++ b/sys/boot/i386/libi386/bootinfo.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bootinfo.c,v 1.17 1999/03/08 11:05:52 dcs Exp $ + * $Id: bootinfo.c,v 1.18 1999/03/18 14:36:22 dcs Exp $ */ #include <stand.h> @@ -47,6 +47,7 @@ static struct int mask; } howto_names[] = { {"boot_askname", RB_ASKNAME}, + {"boot_cdrom", RB_CDROM}, {"boot_userconfig", RB_CONFIG}, {"boot_ddb", RB_KDB}, {"boot_gdb", RB_GDB}, @@ -79,6 +80,9 @@ bi_getboothowto(char *kargs) case 'c': howto |= RB_CONFIG; break; + case 'C': + howto |= RB_CDROM; + break; case 'd': howto |= RB_KDB; break; diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c index 87405f0..045102a 100644 --- a/sys/boot/i386/libi386/bootinfo32.c +++ b/sys/boot/i386/libi386/bootinfo32.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bootinfo.c,v 1.17 1999/03/08 11:05:52 dcs Exp $ + * $Id: bootinfo.c,v 1.18 1999/03/18 14:36:22 dcs Exp $ */ #include <stand.h> @@ -47,6 +47,7 @@ static struct int mask; } howto_names[] = { {"boot_askname", RB_ASKNAME}, + {"boot_cdrom", RB_CDROM}, {"boot_userconfig", RB_CONFIG}, {"boot_ddb", RB_KDB}, {"boot_gdb", RB_GDB}, @@ -79,6 +80,9 @@ bi_getboothowto(char *kargs) case 'c': howto |= RB_CONFIG; break; + case 'C': + howto |= RB_CDROM; + break; case 'd': howto |= RB_KDB; break; diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c index 87405f0..045102a 100644 --- a/sys/boot/i386/libi386/bootinfo64.c +++ b/sys/boot/i386/libi386/bootinfo64.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bootinfo.c,v 1.17 1999/03/08 11:05:52 dcs Exp $ + * $Id: bootinfo.c,v 1.18 1999/03/18 14:36:22 dcs Exp $ */ #include <stand.h> @@ -47,6 +47,7 @@ static struct int mask; } howto_names[] = { {"boot_askname", RB_ASKNAME}, + {"boot_cdrom", RB_CDROM}, {"boot_userconfig", RB_CONFIG}, {"boot_ddb", RB_KDB}, {"boot_gdb", RB_GDB}, @@ -79,6 +80,9 @@ bi_getboothowto(char *kargs) case 'c': howto |= RB_CONFIG; break; + case 'C': + howto |= RB_CDROM; + break; case 'd': howto |= RB_KDB; break; |
