summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2002-01-04 07:59:27 +0000
committerjhb <jhb@FreeBSD.org>2002-01-04 07:59:27 +0000
commit97b2294b8568d6c5ae384f8f606cb7b6541db33a (patch)
tree4877e3bbec34e791986dfdd72f33d6fd4b52b003 /sys/boot
parenta239a7e562c3eec0de53a1577b8d844c1f775ff3 (diff)
downloadFreeBSD-src-97b2294b8568d6c5ae384f8f606cb7b6541db33a.zip
FreeBSD-src-97b2294b8568d6c5ae384f8f606cb7b6541db33a.tar.gz
Don't turn on RB_CDROM if the rootdev is a BIOS cd device for now as this
breaks when cdboot is used with an MFS root.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/libi386/bootinfo.c2
-rw-r--r--sys/boot/i386/libi386/bootinfo32.c2
-rw-r--r--sys/boot/i386/libi386/bootinfo64.c2
3 files changed, 0 insertions, 6 deletions
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 1c6b1d2..448bb5b 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -284,8 +284,6 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip)
/* Pass in BIOS device number. */
bi.bi_bios_dev = bc_unit2bios(rootdev->d_kind.bioscd.unit);
bootdevnr = bc_getdev(rootdev);
- if (bootdevnr != -1)
- *howtop |= RB_CDROM;
break;
case DEVT_DISK:
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c
index 1c6b1d2..448bb5b 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/sys/boot/i386/libi386/bootinfo32.c
@@ -284,8 +284,6 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip)
/* Pass in BIOS device number. */
bi.bi_bios_dev = bc_unit2bios(rootdev->d_kind.bioscd.unit);
bootdevnr = bc_getdev(rootdev);
- if (bootdevnr != -1)
- *howtop |= RB_CDROM;
break;
case DEVT_DISK:
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index 1c6b1d2..448bb5b 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -284,8 +284,6 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip)
/* Pass in BIOS device number. */
bi.bi_bios_dev = bc_unit2bios(rootdev->d_kind.bioscd.unit);
bootdevnr = bc_getdev(rootdev);
- if (bootdevnr != -1)
- *howtop |= RB_CDROM;
break;
case DEVT_DISK:
OpenPOWER on IntegriCloud