From 3d8993c197af57d7d736f040453fe29d1a4f5d09 Mon Sep 17 00:00:00 2001
From: Guy Helmer <ghelmer@FreeBSD.org>
Date: Fri, 4 Jun 1999 03:18:28 +0000
Subject: 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
---
 sys/boot/i386/libi386/bootinfo.c   | 6 +++++-
 sys/boot/i386/libi386/bootinfo32.c | 6 +++++-
 sys/boot/i386/libi386/bootinfo64.c | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'sys/boot')

diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 87405f096067..045102a86ef3 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 87405f096067..045102a86ef3 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 87405f096067..045102a86ef3 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;
-- 
cgit v1.3